diff --git a/.tx/config b/.tx/config
index 50b0d22075be470e28e5e3b689eb05a33af92ab0..9b9a34a68e914549467009258bffd7464a355023 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,247 +2,253 @@
 host = https://www.transifex.com
 type = PO
 
-[FusionDirectory-110.alias]
+[FusionDirectory-1x.alias]
 file_filter = alias/locale/<lang>/fusiondirectory.po
 source_file = alias/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.applications]
+[FusionDirectory-1x.applications]
 file_filter = applications/locale/<lang>/fusiondirectory.po
 source_file = applications/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.argonaut]
+[FusionDirectory-1x.argonaut]
 file_filter = argonaut/locale/<lang>/fusiondirectory.po
 source_file = argonaut/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.audit]
+[FusionDirectory-1x.audit]
 file_filter = audit/locale/<lang>/fusiondirectory.po
 source_file = audit/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.autofs]
+[FusionDirectory-1x.autofs]
 file_filter = autofs/locale/<lang>/fusiondirectory.po
 source_file = autofs/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.certificates]
+[FusionDirectory-1x.certificates]
 file_filter = certificates/locale/<lang>/fusiondirectory.po
 source_file = certificates/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.community]
+[FusionDirectory-1x.community]
 file_filter = community/locale/<lang>/fusiondirectory.po
 source_file = community/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.cyrus]
+[FusionDirectory-1x.cyrus]
 file_filter = cyrus/locale/<lang>/fusiondirectory.po
 source_file = cyrus/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.debconf]
+[FusionDirectory-1x.debconf]
 file_filter = debconf/locale/<lang>/fusiondirectory.po
 source_file = debconf/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.developers]
+[FusionDirectory-1x.developers]
 file_filter = developers/locale/<lang>/fusiondirectory.po
 source_file = developers/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.dhcp]
+[FusionDirectory-1x.dhcp]
 file_filter = dhcp/locale/<lang>/fusiondirectory.po
 source_file = dhcp/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.dns]
+[FusionDirectory-1x.dns]
 file_filter = dns/locale/<lang>/fusiondirectory.po
 source_file = dns/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.dovecot]
+[FusionDirectory-1x.dovecot]
 file_filter = dovecot/locale/<lang>/fusiondirectory.po
 source_file = dovecot/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.dsa]
+[FusionDirectory-1x.dsa]
 file_filter = dsa/locale/<lang>/fusiondirectory.po
 source_file = dsa/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.ejbca]
+[FusionDirectory-1x.ejbca]
 file_filter = ejbca/locale/<lang>/fusiondirectory.po
 source_file = ejbca/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.fai]
+[FusionDirectory-1x.fai]
 file_filter = fai/locale/<lang>/fusiondirectory.po
 source_file = fai/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.freeradius]
+[FusionDirectory-1x.freeradius]
 file_filter = freeradius/locale/<lang>/fusiondirectory.po
 source_file = freeradius/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.fusioninventory]
+[FusionDirectory-1x.fusioninventory]
 file_filter = fusioninventory/locale/<lang>/fusiondirectory.po
 source_file = fusioninventory/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.gpg]
+[FusionDirectory-1x.gpg]
 file_filter = gpg/locale/<lang>/fusiondirectory.po
 source_file = gpg/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.ipmi]
+[FusionDirectory-1x.ipmi]
 file_filter = ipmi/locale/<lang>/fusiondirectory.po
 source_file = ipmi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.kolab2]
-file_filter = kolab2/locale/<lang>/fusiondirectory.po
-source_file = kolab2/locale/en/fusiondirectory.po
-source_lang = en
-
-[FusionDirectory-110.ldapdump]
+[FusionDirectory-1x.ldapdump]
 file_filter = ldapdump/locale/<lang>/fusiondirectory.po
 source_file = ldapdump/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.ldapmanager]
+[FusionDirectory-1x.ldapmanager]
 file_filter = ldapmanager/locale/<lang>/fusiondirectory.po
 source_file = ldapmanager/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.mail]
+[FusionDirectory-1x.mail]
 file_filter = mail/locale/<lang>/fusiondirectory.po
 source_file = mail/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.mixedgroups]
+[FusionDirectory-1x.mixedgroups]
 file_filter = mixedgroups/locale/<lang>/fusiondirectory.po
 source_file = mixedgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.nagios]
+[FusionDirectory-1x.nagios]
 file_filter = nagios/locale/<lang>/fusiondirectory.po
 source_file = nagios/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.netgroups]
+[FusionDirectory-1x.netgroups]
 file_filter = netgroups/locale/<lang>/fusiondirectory.po
 source_file = netgroups/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.newsletter]
+[FusionDirectory-1x.newsletter]
 file_filter = newsletter/locale/<lang>/fusiondirectory.po
 source_file = newsletter/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.opsi]
+[FusionDirectory-1x.opsi]
 file_filter = opsi/locale/<lang>/fusiondirectory.po
 source_file = opsi/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.personal]
+[FusionDirectory-1x.personal]
 file_filter = personal/locale/<lang>/fusiondirectory.po
 source_file = personal/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.postfix]
+[FusionDirectory-1x.postfix]
 file_filter = postfix/locale/<lang>/fusiondirectory.po
 source_file = postfix/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.ppolicy]
+[FusionDirectory-1x.posix]
+file_filter = posix/locale/<lang>/fusiondirectory.po
+source_file = posix/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-1x.ppolicy]
 file_filter = ppolicy/locale/<lang>/fusiondirectory.po
 source_file = ppolicy/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.puppet]
+[FusionDirectory-1x.puppet]
 file_filter = puppet/locale/<lang>/fusiondirectory.po
 source_file = puppet/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.pureftpd]
+[FusionDirectory-1x.pureftpd]
 file_filter = pureftpd/locale/<lang>/fusiondirectory.po
 source_file = pureftpd/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.quota]
+[FusionDirectory-1x.quota]
 file_filter = quota/locale/<lang>/fusiondirectory.po
 source_file = quota/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.repository]
+[FusionDirectory-1x.repository]
 file_filter = repository/locale/<lang>/fusiondirectory.po
 source_file = repository/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.samba]
+
+[FusionDirectory-1x.renater-partage]
+file_filter = renater-partage/locale/<lang>/fusiondirectory.po
+source_file = renater-partage/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-1x.samba]
 file_filter = samba/locale/<lang>/fusiondirectory.po
 source_file = samba/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.sogo]
+[FusionDirectory-1x.sogo]
 file_filter = sogo/locale/<lang>/fusiondirectory.po
 source_file = sogo/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.squid]
+[FusionDirectory-1x.spamassassin]
+file_filter = spamassassin/locale/<lang>/fusiondirectory.po
+source_file = spamassassin/locale/en/fusiondirectory.po
+source_lang = en
+
+[FusionDirectory-1x.squid]
 file_filter = squid/locale/<lang>/fusiondirectory.po
 source_file = squid/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.ssh]
+[FusionDirectory-1x.ssh]
 file_filter = ssh/locale/<lang>/fusiondirectory.po
 source_file = ssh/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.subcontracting]
+[FusionDirectory-1x.subcontracting]
 file_filter = subcontracting/locale/<lang>/fusiondirectory.po
 source_file = subcontracting/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.spamassassin]
-file_filter = spamassassin/locale/<lang>/fusiondirectory.po
-source_file = spamassassin/locale/en/fusiondirectory.po
-source_lang = en
-
-[FusionDirectory-110.sudo]
+[FusionDirectory-1x.sudo]
 file_filter = sudo/locale/<lang>/fusiondirectory.po
 source_file = sudo/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.supann]
+[FusionDirectory-1x.supann]
 file_filter = supann/locale/<lang>/fusiondirectory.po
 source_file = supann/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.sympa]
+[FusionDirectory-1x.sympa]
 file_filter = sympa/locale/<lang>/fusiondirectory.po
 source_file = sympa/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.systems]
+[FusionDirectory-1x.systems]
 file_filter = systems/locale/<lang>/fusiondirectory.po
 source_file = systems/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.user-reminder]
+[FusionDirectory-1x.user-reminder]
 file_filter = user-reminder/locale/<lang>/fusiondirectory.po
 source_file = user-reminder/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.weblink]
+[FusionDirectory-1x.weblink]
 file_filter = weblink/locale/<lang>/fusiondirectory.po
 source_file = weblink/locale/en/fusiondirectory.po
 source_lang = en
 
-[FusionDirectory-110.webservice]
+[FusionDirectory-1x.webservice]
 file_filter = webservice/locale/<lang>/fusiondirectory.po
 source_file = webservice/locale/en/fusiondirectory.po
 source_lang = en
diff --git a/README.md b/README.md
index 233203b136424171291d955fe4f07f1adf9e9384..d7d7ba757fe6aad07d5d31ebba8d15ae6dce5137 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1 @@
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=fusiondirectory&url=https://github.com/fusiondirectory&title=FusionDirectory&language=en_GB&tags=github&category=software) 
-
+[Donate to FusionDirectory on Liberapay](https://liberapay.com/fusiondirectory/donate)
diff --git a/alias/admin/alias/class_mailAliasDistribution.inc b/alias/admin/alias/class_mailAliasDistribution.inc
index c0fd5a91a41e21ab45947541c840e0de5164a39e..357ec292c6e839fd150ea087dcfa2ef856a91855 100644
--- a/alias/admin/alias/class_mailAliasDistribution.inc
+++ b/alias/admin/alias/class_mailAliasDistribution.inc
@@ -43,9 +43,9 @@ class mailAliasDistribution extends simplePlugin
     );
   }
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
-    global $config;
     return array(
       'main' => array(
         'name'  => _('Mail distribution'),
diff --git a/alias/admin/alias/class_mailAliasRedirection.inc b/alias/admin/alias/class_mailAliasRedirection.inc
index b13a9594978d75c0a5830f3eb6ccdbe01d627b5f..b2f02c5c1c7fb5895762d686af5b781a871d0231 100644
--- a/alias/admin/alias/class_mailAliasRedirection.inc
+++ b/alias/admin/alias/class_mailAliasRedirection.inc
@@ -43,9 +43,11 @@ class mailAliasRedirection extends simplePlugin
     );
   }
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
+      // Attributes are grouped by section
       'main' => array(
         'name'  => _('Mail redirection'),
         'attrs' => array(
@@ -70,7 +72,7 @@ class mailAliasRedirection extends simplePlugin
           new DateAttribute(
             _('Expiration date'), _('Date after which the redirection should be deleted. Leave empty for no deletion.'),
             'aliasExpirationDate', FALSE,
-            // Unix timestamp
+             // Unix timestamp
             'U',
             ''
           )
diff --git a/alias/locale/ar/fusiondirectory.po b/alias/locale/ar/fusiondirectory.po
index d4add8f6f5c3b2bba9d4249d005aa650a9f3e0c4..924586e93134e61c1fe2a0283f3b8aa8245f57de 100644
--- a/alias/locale/ar/fusiondirectory.po
+++ b/alias/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/ca/fusiondirectory.po b/alias/locale/ca/fusiondirectory.po
index 44baca035a98fce67be18054ca45f6aaf59a797c..ab4ecd0827ad694d96b7c0950e267588decd5107 100644
--- a/alias/locale/ca/fusiondirectory.po
+++ b/alias/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nom"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/cs_CZ/fusiondirectory.po b/alias/locale/cs_CZ/fusiondirectory.po
index 5e2e97566793d7bad3d8fcc55bbd6325b91570a3..d4c195966d691430013ba047b157cc6dd369239e 100644
--- a/alias/locale/cs_CZ/fusiondirectory.po
+++ b/alias/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,54 +44,56 @@ 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:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "PÅ™esmÄ›rovÃ¡nÃ e-mailu"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "NÃ¡zev identifikujÃcÃ toto pÅ™esmÄ›rovÃ¡nÃ"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Popis tohoto pÅ™esmÄ›rovÃ¡nÃ"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "PÅ™esmÄ›rovat z"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "E-mailovÃ¡ adresa, ze kterÃ© chcete pÅ™esmÄ›rovat"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "PÅ™esmÄ›rovat na"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "CÃl tohoto pÅ™esmÄ›rovÃ¡nÃ"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
-msgstr "Datum skonÄenÃ platnosti"
+msgstr "Datum vyprÅ¡enÃ platnosti"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Datum, po kterÃ©m by mÄ›lo bÃ½t toto pÅ™esmÄ›rovÃ¡nÃ samoÄinnÄ› smazÃ¡no. Pro nemazÃ¡nÃ ponechte prÃ¡zdnÃ©."
+msgstr ""
+"Datum, po kterÃ©m by mÄ›lo bÃ½t toto pÅ™esmÄ›rovÃ¡nÃ samoÄinnÄ› smazÃ¡no. Pro "
+"nemazÃ¡nÃ ponechte prÃ¡zdnÃ©."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -104,7 +107,7 @@ msgstr "Distribuce e-mailÅ¯"
 
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
-msgstr "NÃ¡zev identifikujÃcÃ tento alternativnÃ nÃ¡zev"
+msgstr "NÃ¡zev pro identifikaci tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
@@ -112,7 +115,7 @@ msgstr "Popis tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
-msgstr "E-mailovÃ¡ adresa"
+msgstr "e-mailovÃ¡ adresa"
 
 #: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
@@ -124,7 +127,7 @@ msgstr "Alternativa tÃ©to e-mailovÃ© adresy"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
-msgstr "E-mailovÃ½ server"
+msgstr "poÅ¡tovnÃ server"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
@@ -133,15 +136,17 @@ msgstr "PoÅ¡tovnÃ server pro tento alternativnÃ nÃ¡zev"
 #: 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Ã©."
+msgstr ""
+"Datum po kterÃ©m by mÄ›l bÃ½t alternativnÃ nÃ¡zev automaticky smazÃ¡n. Pro "
+"nemazÃ¡nÃ ponechte nevyplnÄ›nÃ©."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
-msgstr "AlternativnÃ nÃ¡zvy"
+msgstr "alternativnÃ nÃ¡zev (alias)"
 
 #: admin/alias/class_aliasManagement.inc:34
 msgid "Alias management"
-msgstr "SprÃ¡va alternativnÃch nÃ¡zvÅ¯ (alias)"
+msgstr "ZprÃ¡va pÅ™ezdÃvek"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
diff --git a/alias/locale/de/fusiondirectory.po b/alias/locale/de/fusiondirectory.po
index 9381ecd40e9336cb1c7a95482565f8c6917b2bd9..91e7442489cec4324d6e9a3df99e2e0135420620 100644
--- a/alias/locale/de/fusiondirectory.po
+++ b/alias/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,54 +44,56 @@ msgstr "Zweig in welchem Aliase gespeichert werden"
 msgid "Temporary mail redirection"
 msgstr "TemporÃ¤re Mailumleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Mailweiterleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Name"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Name um diese Umleitung zu identifizieren"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beschreibung dieser Umleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Umleiten von"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Mailadressen von der Sie umleiten wollen"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Umleiten zu"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Ziel dieser Umleitung"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Datum nach dem die Umleitung gelÃ¶scht werden soll. Leer lassen fÃ¼r keine LÃ¶schung."
+msgstr ""
+"Datum nach dem die Umleitung gelÃ¶scht werden soll. Leer lassen fÃ¼r keine "
+"LÃ¶schung."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -125,7 +127,7 @@ msgstr "Aliase fÃ¼r diese Emailadresse"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
-msgstr "Mailserver"
+msgstr "Mail-Server"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
@@ -134,7 +136,9 @@ msgstr ""
 #: 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."
+msgstr ""
+"Datum nach dem das Alias gelÃ¶scht werden soll. Leer lassen damit nicht "
+"gelÃ¶scht wird."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/el_GR/fusiondirectory.po b/alias/locale/el_GR/fusiondirectory.po
index d41cf93b1b56a7f22565c48c386b615fe731d38c..11e031d2d2cd412a6659498e6fa852eeeca0bc92 100644
--- a/alias/locale/el_GR/fusiondirectory.po
+++ b/alias/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,54 +44,56 @@ msgstr "ÎšÎ»Î¬Î´Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎ¿Î½Ï„Î±Î¹ Ï„Î± al
 msgid "Temporary mail redirection"
 msgstr "Î ÏÎ¿ÏƒÏ‰ÏÎ¹Î½Î® Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Î¼Îµ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Î½Î±Î³Î½Ï‰ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï…Ï„Î® Î· Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î® Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Ï€ÏŒ"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Ï€Î¿Ï… Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î±Î½Î±ÎºÎ±Ï„ÎµÏ…Î¸ÏÎ½ÎµÏ„Îµ"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÏƒÎµ"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Î ÏÎ¿Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Ï„Î·Î½ Î¿Ï€Î¿Î¯Î± Î¸Î± Î´Î¹Î±Ï†ÏÎ¬Ï†ÎµÏ„Î±Î¹ Ï„Î¿ alias. Î‘Ï†Î®ÏƒÏ„Îµ Ï„Î¿ ÎºÎµÎ½ÏŒ Î³Î¹Î± Î¼Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î®"
+msgstr ""
+"Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Ï„Î·Î½ Î¿Ï€Î¿Î¯Î± Î¸Î± Î´Î¹Î±Ï†ÏÎ¬Ï†ÎµÏ„Î±Î¹ Ï„Î¿ alias. Î‘Ï†Î®ÏƒÏ„Îµ Ï„Î¿ ÎºÎµÎ½ÏŒ Î³Î¹Î± "
+"Î¼Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -105,11 +107,11 @@ msgstr "Î”Î¹Î±Î½Î¿Î¼Î® Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
-msgstr "ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Î¼Îµ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Î½Î±Î³Î½Ï‰ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒ Ï„Î¿ alias"
+msgstr "ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Î¼Îµ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Î½Î±Î³Î½Ï‰ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏˆÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿"
 
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description of this alias"
-msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… alias"
+msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… ÏˆÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿Ï…"
 
 #: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
@@ -134,7 +136,8 @@ msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ a
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Ï„Î·Î½ Î¿Ï€Î¿Î¯Î± Î¸Î± Î´Î¹Î±Ï†ÏÎ¬Ï†ÎµÏ„Î±Î¹ Ï„Î¿ alias. ÎšÎµÎ½ÏŒ Î³Î¹Î± Î¼Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î®"
+msgstr ""
+"Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Ï„Î·Î½ Î¿Ï€Î¿Î¯Î± Î¸Î± Î´Î¹Î±Ï†ÏÎ¬Ï†ÎµÏ„Î±Î¹ Ï„Î¿ alias. ÎšÎµÎ½ÏŒ Î³Î¹Î± Î¼Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/en/fusiondirectory.po b/alias/locale/en/fusiondirectory.po
index 90a4a473be7233d879e7f65cec39c20d087105b6..d939933e7bc6fa07357f007e9e35a65b6af6d58f 100644
--- a/alias/locale/en/fusiondirectory.po
+++ b/alias/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/es/fusiondirectory.po b/alias/locale/es/fusiondirectory.po
index 489179d178bcddda288cf885dae02db48c42b68b..e6ee636b4a16ad9af847a3f70893d2dc7fd7bb5f 100644
--- a/alias/locale/es/fusiondirectory.po
+++ b/alias/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/es_CO/fusiondirectory.po b/alias/locale/es_CO/fusiondirectory.po
index 8c28c45242e9fb7b0db50debac1486e063a91210..8b2f28df2dee14d1566f81fde103facf0fa5d3db 100644
--- a/alias/locale/es_CO/fusiondirectory.po
+++ b/alias/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/es_VE/fusiondirectory.po b/alias/locale/es_VE/fusiondirectory.po
index 09d0959313e218594e9aedab9fcdc547eeeee7e3..8e8b983812937d8af26c129c6c517ddaf3aa0aed 100644
--- a/alias/locale/es_VE/fusiondirectory.po
+++ b/alias/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/fa_IR/fusiondirectory.po b/alias/locale/fa_IR/fusiondirectory.po
index dc958b507c359b5a5c6becad271add633a75c643..e39ef37b6d46be7db996212eb9939ff251981bc5 100644
--- a/alias/locale/fa_IR/fusiondirectory.po
+++ b/alias/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/fi_FI/fusiondirectory.po b/alias/locale/fi_FI/fusiondirectory.po
index 6d0c9536503e3aca9cb76479d88f383842a46a27..33bb8d8dae5442a430446d89d6c14eb133f90b05 100644
--- a/alias/locale/fi_FI/fusiondirectory.po
+++ b/alias/locale/fi_FI/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Dina Solveig Jalkanen, 2016
-# Dina Solveig Jalkanen, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr "VÃ¤liaikainen sÃ¤hkÃ¶postin edelleenlÃ¤hetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "SÃ¤hkÃ¶postin edelleenlÃ¤hetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "NimeÃ¤ edelleenlÃ¤hetys"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "EdelleenlÃ¤hetyksen kuvaus"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "ErÃ¤pÃ¤ivÃ¤"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/fr/fusiondirectory.po b/alias/locale/fr/fusiondirectory.po
index 4432383b0edb356110122d8736ad40d301da65ac..241c79164a76e8e2416bbfe267d69dcb4a234bd3 100644
--- a/alias/locale/fr/fusiondirectory.po
+++ b/alias/locale/fr/fusiondirectory.po
@@ -1,20 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# gallak <antoine.gallavardin@free.fr>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +32,7 @@ msgstr "Alias"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Alias RDN"
-msgstr "Branche des alias"
+msgstr "Alias RDN"
 
 #: config/alias/class_aliasConfig.inc:45
 msgid "Branch in which aliases will be stored"
@@ -45,66 +42,68 @@ msgstr "Branche dans laquelle les alias sont stockÃ©s"
 #: admin/alias/class_mailAliasRedirection.inc:32
 #: admin/alias/class_mailAliasRedirection.inc:35
 msgid "Temporary mail redirection"
-msgstr "Redirection temporaire de courriel"
+msgstr "Adresse de redirection temporaire"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
-msgstr "Redirection de courriel"
+msgstr "Redirection de messagerie"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nom"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
-msgstr "Nom de la redirection de courriel"
+msgstr "Nom de la redirection de messagerie"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Description"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Description de la redirection"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Rediriger depuis"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
-msgstr "Adresse de courriel depuis laquelle vous voulez rediriger"
+msgstr "Adresse de messagerie depuis laquelle vous voulez rediriger"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Rediriger vers"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Destination de la redirection"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
-msgstr "Date dâ€™expiration"
+msgstr "Date d'expiration"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. Laisser vide pour aucune expiration."
+msgstr ""
+"Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. laisser vide pour aucune "
+"expiration"
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
 #: admin/alias/class_mailAliasDistribution.inc:35
 msgid "Temporary mail distribution"
-msgstr "Redistribution temporaire de courriel"
+msgstr "Adresse de distribution temporaire"
 
 #: admin/alias/class_mailAliasDistribution.inc:51
 msgid "Mail distribution"
-msgstr "Redistribution de courriel"
+msgstr "Redistribution de messagerie"
 
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name to identify this alias"
@@ -116,28 +115,30 @@ msgstr "Description de l'alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:60
 msgid "Email address"
-msgstr "Adresse de courriel"
+msgstr "Adresse de messagerie"
 
 #: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Email aliases"
-msgstr "Alias de courriel"
+msgstr "Alias de messagerie"
 
 #: admin/alias/class_mailAliasDistribution.inc:65
 msgid "Aliases for this email address"
-msgstr "Alias pour cette adresse de courriel"
+msgstr "Alias pour cette adresse de messagerie"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server"
-msgstr "Serveur de courriel"
+msgstr "Serveur de messagerie"
 
 #: admin/alias/class_mailAliasDistribution.inc:70
 msgid "Mail server for this alias"
-msgstr "Serveur de courriel pour cet alias"
+msgstr "Serveur de messagerie pour cet alias"
 
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. Laisser vide pour aucune expiration."
+msgstr ""
+"Date aprÃ¨s laquelle cet alias doit Ãªtre effacÃ©. laisser vide pour aucune "
+"expiration"
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
@@ -149,4 +150,4 @@ msgstr "Gestion des alias"
 
 #: admin/alias/class_aliasManagement.inc:38
 msgid "Mail aliases"
-msgstr "Alias de courriel"
+msgstr "Alias de messagerie"
diff --git a/alias/locale/hu_HU/fusiondirectory.po b/alias/locale/hu_HU/fusiondirectory.po
index 8087ab9703986df68ea6dff2b86222ff879903ff..8460a07fce0d57d74338b2f267fe4c44d0386254 100644
--- a/alias/locale/hu_HU/fusiondirectory.po
+++ b/alias/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "LeÃrÃ¡s"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/id/fusiondirectory.po b/alias/locale/id/fusiondirectory.po
index e6e7687f7dd13034247d4ce407a9092bf1d65787..02e28fa94e2c70b892956aab7cdbf09c6af9b5a8 100644
--- a/alias/locale/id/fusiondirectory.po
+++ b/alias/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/it_IT/fusiondirectory.po b/alias/locale/it_IT/fusiondirectory.po
index 85800dc6f5d41e64e96a3ef9365723aaf77d6605..b1c9596aa14c5673a08546d13837133bde5c4079 100644
--- a/alias/locale/it_IT/fusiondirectory.po
+++ b/alias/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:25+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,54 +44,56 @@ msgstr "Ramo nel quale gli alias saranno immagazzinati"
 msgid "Temporary mail redirection"
 msgstr "Redirezione mail temporanea"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Redirezione mail"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nome per identificare questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Descrizione di questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Reindirizzare da"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Indirizzo mail dal quale volete reindirizzare"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Reindirizzare verso"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Destinazione di questa redirezione"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Data dopo la quale la redirezione sarÃ  cancellata.Lasciare vuoto per non cancellare la redirezione."
+msgstr ""
+"Data dopo la quale la redirezione sarÃ  cancellata.Lasciare vuoto per non "
+"cancellare la redirezione."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -136,7 +136,9 @@ msgstr "Server mail per questo alias"
 #: 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."
+msgstr ""
+"Data dopo la quale l'alias sarÃ  cancellato. Lasciare vuoto per disabilitare "
+"la cancellazione."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/lv/fusiondirectory.po b/alias/locale/lv/fusiondirectory.po
index 492a375ea8ade75c990dcc0d3081d4437c917213..f041c5ab9757857c41c6fa977a37b7802649c8c6 100644
--- a/alias/locale/lv/fusiondirectory.po
+++ b/alias/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,54 +44,56 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr "Pagaidu pasta novirzÄ«Å¡ana"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Pasta novirzÄ«Å¡ana"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nosaukums Å¡Ä«s novirzÄ«Å¡anas atpazÄ«Å¡anai"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "NovirzÄ«Å¡anas apraksts"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "NovirzÄ«t no"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Pasta adrese, kuru vÄ“laties novirzÄ«t"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "NovirzÄ«t uz"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Å Ä«s novirzÄ«Å¡anas saÅ†Ä“mÄ“js"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "DerÄ«guma termiÅ†Å¡"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Datums, pÄ“c kura novirzÄ«Å¡ana jÄizdzÄ“Å¡. AtstÄjite tukÅ¡u, ja nevÄ“laties izdzÄ“st."
+msgstr ""
+"Datums, pÄ“c kura novirzÄ«Å¡ana jÄizdzÄ“Å¡. AtstÄjite tukÅ¡u, ja nevÄ“laties "
+"izdzÄ“st."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
diff --git a/alias/locale/nb/fusiondirectory.po b/alias/locale/nb/fusiondirectory.po
index 29c92ce36e511ad34ba809e6720afd8896eecf3e..bc1159628b73a3f158525f0d71162eb35f1cbd8a 100644
--- a/alias/locale/nb/fusiondirectory.po
+++ b/alias/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Navn"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/nl/fusiondirectory.po b/alias/locale/nl/fusiondirectory.po
index eeeb8c06efedb4e1a817ada8380a259660e0b69f..3867c53846e7ff7305cb00ad7758b9d91fb229b3 100644
--- a/alias/locale/nl/fusiondirectory.po
+++ b/alias/locale/nl/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,54 +44,56 @@ msgstr "Branch in welke de aliases zullen worden opgeslagen"
 msgid "Temporary mail redirection"
 msgstr "Tijdelijke mail redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Mail redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Naam"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Naam om deze redirectie te identificeren"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beschrijving van de redirectie"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Omleiden van"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Mail adres dat je wilt omleiden"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Doorsturen naar"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Bestemming van deze omleiding"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Datum waarna de omleiding verwijderd moet worden. Laat leeg voor niet te verwijderen."
+msgstr ""
+"Datum waarna de omleiding verwijderd moet worden. Laat leeg voor niet te "
+"verwijderen."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -134,11 +136,13 @@ msgstr "Mail server voor deze alias"
 #: 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."
+msgstr ""
+"Datum waarna de alias verwijderd zou moeten worden. Laat leeg indien de "
+"alias niet verwijderd moet worden."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
-msgstr "Aliases"
+msgstr "Alias"
 
 #: admin/alias/class_aliasManagement.inc:34
 msgid "Alias management"
diff --git a/alias/locale/pl/fusiondirectory.po b/alias/locale/pl/fusiondirectory.po
index e572475d8bc30faed838659dd94d6763b3de2b23..2c7d3d82f926c4564b43699bb27c5ed0511ac2d5 100644
--- a/alias/locale/pl/fusiondirectory.po
+++ b/alias/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Opis"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/pt/fusiondirectory.po b/alias/locale/pt/fusiondirectory.po
index 3cdff3b76950e641d436829c4b4555536ccf87c0..cd6726dc9adaebd9b5f530250c32ce0f70fb4878 100644
--- a/alias/locale/pt/fusiondirectory.po
+++ b/alias/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/pt_BR/fusiondirectory.po b/alias/locale/pt_BR/fusiondirectory.po
index 6c68740f74b6ee2897a2acab687f4a0ffb306694..b65c8f12da56508df7cd3de3c2a20837d2cb453d 100644
--- a/alias/locale/pt_BR/fusiondirectory.po
+++ b/alias/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,54 +44,56 @@ msgstr "Filial onde as Aliases sÃ£o armazenados"
 msgid "Temporary mail redirection"
 msgstr "Redirecionamento temporÃ¡rio de correio"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Redirecionamento de correio"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Nome"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Nome para identificar este redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "DescriÃ§Ã£o deste redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Redirecionar de"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 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:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Redirecionar para"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Destino deste redirecionamento"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Data para que o redirecionamento seja eliminado. Deixe em branco para que nÃ£o seja excluÃdo."
+msgstr ""
+"Data para que o redirecionamento seja eliminado. Deixe em branco para que "
+"nÃ£o seja excluÃdo."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -133,7 +136,9 @@ msgstr ""
 #: 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."
+msgstr ""
+"Data para que o alias seja eliminado. Deixe em branco para que nÃ£o seja "
+"excluÃdo."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/ru/fusiondirectory.po b/alias/locale/ru/fusiondirectory.po
index d348e4527b3b4c40b8bb485f1eed76ff07dc6738..7867646c1ac08b1e5c07d69db5cdbf822614a988 100644
--- a/alias/locale/ru/fusiondirectory.po
+++ b/alias/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015-2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,54 +44,56 @@ msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ Ð¿ÑÐµÐ²Ð¾Ð´
 msgid "Temporary mail redirection"
 msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÑŽÑ‰ÐµÐµ ÑÑ‚Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾Ñ‚ÐºÑƒÐ´Ð°"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð²Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÑƒÐ´Ð°"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
+msgstr ""
+"Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ "
+"ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -135,7 +136,9 @@ msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð°"
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid ""
 "Date after which the alias should be deleted. Leave empty for no deletion."
-msgstr "Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
+msgstr ""
+"Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ´Ð°Ð»ÐµÐ½. ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, ÐµÑÐ»Ð¸ ÑƒÐ´Ð°Ð»ÑÑ‚ÑŒ Ð½Ðµ "
+"Ð½ÑƒÐ¶Ð½Ð¾."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/ru@petr1708/fusiondirectory.po b/alias/locale/ru@petr1708/fusiondirectory.po
index 84ed4cbf72062d338dfe7cd86ff6103d4c10363c..236f8793c078ab5f76e3cc7bfdf7b69c8e61db54 100644
--- a/alias/locale/ru@petr1708/fusiondirectory.po
+++ b/alias/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/sv/fusiondirectory.po b/alias/locale/sv/fusiondirectory.po
index cd59a3860b0b1774c2679dbd783d44982a6e2999..3428c96d4cdca361c8073285d0a37270bce40275 100644
--- a/alias/locale/sv/fusiondirectory.po
+++ b/alias/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,54 +44,55 @@ msgstr "Gren dÃ¤r alias ska lagras"
 msgid "Temporary mail redirection"
 msgstr "TemporÃ¤r omdirigering fÃ¶r epost"
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr "Epost-omdirigering"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "Namn"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr "Namn fÃ¶r att identifiera omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr "Beskrivning av omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr "Omdirigera frÃ¥n"
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr "Epostadress frÃ¥n vilken du vill omdirigera"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr "Omdirigera till"
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr "Destination fÃ¶r omdirigeringen"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr "UtgÃ¥ngsdatum"
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
-msgstr "Datum dÃ¥ omdirigeringen ska tas bort. LÃ¤mna tomt fÃ¶r att inte ta bort."
+msgstr ""
+"Datum dÃ¥ omdirigeringen ska tas bort. LÃ¤mna tomt fÃ¶r att inte ta bort."
 
 #: admin/alias/class_mailAliasDistribution.inc:31
 #: admin/alias/class_mailAliasDistribution.inc:32
@@ -133,7 +135,9 @@ msgstr ""
 #: 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."
+msgstr ""
+"Datum efter vilket alias ska tas bort. LÃ¤mna tomt fÃ¶r att inte ta bort "
+"aliaset."
 
 #: admin/alias/class_aliasManagement.inc:33
 msgid "Aliases"
diff --git a/alias/locale/ug/fusiondirectory.po b/alias/locale/ug/fusiondirectory.po
index 6dc446cb1f74e58cb86a8b0998b01ae0a193eb56..e7b6f609517826de9e9ad7cae2acb978cb584696 100644
--- a/alias/locale/ug/fusiondirectory.po
+++ b/alias/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +43,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/vi_VN/fusiondirectory.po b/alias/locale/vi_VN/fusiondirectory.po
index c479dbd0557441df8304605d48c0569db35fe953..0aa20f7abd2998cf9c7e47f6ea5317b22837ec61 100644
--- a/alias/locale/vi_VN/fusiondirectory.po
+++ b/alias/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/alias/locale/zh/fusiondirectory.po b/alias/locale/zh/fusiondirectory.po
index cb5ee0a5c44022cb2729c00b55a470ff369ea1c9..6355c135fb92c7f06e41e764b3754d9d712fc787 100644
--- a/alias/locale/zh/fusiondirectory.po
+++ b/alias/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,50 +44,50 @@ msgstr ""
 msgid "Temporary mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:50
+#: admin/alias/class_mailAliasRedirection.inc:52
 msgid "Mail redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 #: admin/alias/class_mailAliasDistribution.inc:54
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/alias/class_mailAliasRedirection.inc:53
+#: admin/alias/class_mailAliasRedirection.inc:55
 msgid "Name to identify this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 #: admin/alias/class_mailAliasDistribution.inc:56
 msgid "Description"
 msgstr "æè¿°"
 
-#: admin/alias/class_mailAliasRedirection.inc:55
+#: admin/alias/class_mailAliasRedirection.inc:57
 msgid "Description of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Redirect from"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:60
+#: admin/alias/class_mailAliasRedirection.inc:62
 msgid "Mail address from which you want to redirect"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Redirect to"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:66
+#: admin/alias/class_mailAliasRedirection.inc:68
 msgid "Destination of this redirection"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 #: admin/alias/class_mailAliasDistribution.inc:75
 msgid "Expiration date"
 msgstr ""
 
-#: admin/alias/class_mailAliasRedirection.inc:71
+#: admin/alias/class_mailAliasRedirection.inc:73
 msgid ""
 "Date after which the redirection should be deleted. Leave empty for no "
 "deletion."
diff --git a/applications/locale/ar/fusiondirectory.po b/applications/locale/ar/fusiondirectory.po
index 859732137a73ccf1525e185be2d959b6ad3aa162..e7290c42fe81c85d92b7e25cf11cf1f44cd73352 100644
--- a/applications/locale/ar/fusiondirectory.po
+++ b/applications/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/ca/fusiondirectory.po b/applications/locale/ca/fusiondirectory.po
index 31a17084869876db68a94d436cef69ff965d7a10..31836d275a0c0992e783c82e1c79ac33b99a52ef 100644
--- a/applications/locale/ca/fusiondirectory.po
+++ b/applications/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/cs_CZ/fusiondirectory.po b/applications/locale/cs_CZ/fusiondirectory.po
index 94f28aeb7f67ceeb94091fe58decf401b5b67558..98b87b01d03fc56e5801f53d0c5c59f7eab9214b 100644
--- a/applications/locale/cs_CZ/fusiondirectory.po
+++ b/applications/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgstr ""
 #: admin/roles/class_applicationRights.inc:30
 #: admin/roles/class_applicationRights.inc:49
 msgid "Applications"
-msgstr "Aplikace"
+msgstr "aplikace"
 
 #: config/applications/class_applicationsPluginConfig.inc:29
 msgid "Applications plugin configuration"
@@ -67,7 +68,7 @@ msgstr "VÅ¡e"
 
 #: admin/applications/class_applicationManagement.inc:29
 msgid "Application management"
-msgstr "SprÃ¡va aplikacÃ"
+msgstr "sprÃ¡va aplikacÃ"
 
 #: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
@@ -78,7 +79,7 @@ msgstr "WebovÃ© aplikace"
 #: admin/applications/class_applicationGeneric.inc:46
 #: admin/applications/class_webApplication.inc:45
 msgid "Application"
-msgstr "Aplikace"
+msgstr "aplikace"
 
 #: admin/applications/class_applicationGeneric.inc:30
 msgid "Application information"
@@ -86,7 +87,7 @@ msgstr "Informace o aplikaci"
 
 #: admin/applications/class_applicationGeneric.inc:50
 msgid "Application name"
-msgstr "NÃ¡zev aplikace"
+msgstr "nÃ¡zev aplikace"
 
 #: admin/applications/class_applicationGeneric.inc:50
 msgid "The name of this application"
@@ -95,7 +96,7 @@ msgstr "NÃ¡zev tÃ©to aplikace"
 #: admin/applications/class_applicationGeneric.inc:54
 #: admin/applications/class_webApplication.inc:53
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/applications/class_applicationGeneric.inc:54
 #: admin/applications/class_webApplication.inc:53
@@ -104,7 +105,7 @@ msgstr "StruÄnÃ½ popis tÃ©to aplikace"
 
 #: admin/applications/class_applicationGeneric.inc:58
 msgid "Execute"
-msgstr "Spustit"
+msgstr "spustit"
 
 #: admin/applications/class_applicationGeneric.inc:58
 msgid "The application to be executed"
@@ -112,7 +113,7 @@ msgstr "Aplikace, kterÃ¡ mÃ¡ bÃ½t spuÅ¡tÄ›na"
 
 #: admin/applications/class_applicationGeneric.inc:62
 msgid "Display name"
-msgstr "ZobrazovanÃ© jmÃ©no"
+msgstr "zobrazovanÃ© jmÃ©no"
 
 #: admin/applications/class_applicationGeneric.inc:62
 msgid "The displayed name for this application"
@@ -130,7 +131,7 @@ msgstr "Ikona pro tuto aplikaci"
 
 #: admin/applications/class_applicationGeneric.inc:78
 msgid "Options"
-msgstr "PÅ™edvolby"
+msgstr "volby"
 
 #: admin/applications/class_applicationGeneric.inc:81
 msgid "Only executable for member"
@@ -142,15 +143,15 @@ msgstr "SpustitelnÃ© pouze pro Äleny skupiny"
 
 #: admin/applications/class_applicationGeneric.inc:86
 msgid "Replace user configuration on startup"
-msgstr "Nahradit nastavenÃ uÅ¾ivatele pÅ™i spuÅ¡tÄ›nÃ"
+msgstr "nahrazovat konfiguraci uÅ¾ivatele pÅ™i spuÅ¡tÄ›nÃ"
 
 #: admin/applications/class_applicationGeneric.inc:86
 msgid "Replace the user configuration on startup"
-msgstr "PÅ™i spuÅ¡tÄ›nÃ nahradit nastavenÃ uÅ¾ivatele"
+msgstr "PÅ™i startu nahradit nastavenÃ uÅ¾ivatele"
 
 #: admin/applications/class_applicationGeneric.inc:91
 msgid "Place icon on members desktop"
-msgstr "ÄŒlenÅ¯m umÃstit ikonu na plochu"
+msgstr "ÄlenÅ¯m umisÅ¥ovat ikonu na plochu"
 
 #: admin/applications/class_applicationGeneric.inc:91
 msgid "Put an icon on the user desktop"
@@ -167,7 +168,7 @@ msgstr "UmÃstit poloÅ¾ku do nabÃdky po spuÅ¡tÄ›nÃ"
 
 #: admin/applications/class_applicationGeneric.inc:101
 msgid "Place entry in members launch bar"
-msgstr "ÄŒlenÅ¯m poloÅ¾ku umÃstit na panel snadnÃ©ho spuÅ¡tÄ›nÃ"
+msgstr "ÄlenÅ¯m umisÅ¥ovat poloÅ¾ku na panel â€žsnadnÃ© spuÅ¡tÄ›nÃâ€œ"
 
 #: admin/applications/class_webApplication.inc:28
 #: admin/applications/class_webApplication.inc:31
@@ -180,7 +181,7 @@ msgstr "NÃ¡zvy, ikony a odkazy na webovÃ© aplikace"
 
 #: admin/applications/class_webApplication.inc:49
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/applications/class_webApplication.inc:49
 msgid "Name or id for application"
@@ -188,7 +189,7 @@ msgstr "NÃ¡zev nebo identifikÃ¡tor aplikace"
 
 #: admin/applications/class_webApplication.inc:57
 msgid "URL"
-msgstr "URL adresa"
+msgstr "URL"
 
 #: admin/applications/class_webApplication.inc:57
 msgid "Link to this application"
diff --git a/applications/locale/de/fusiondirectory.po b/applications/locale/de/fusiondirectory.po
index 5bb8d229ee96cbf51f6a4f96043cfc534e1202ad..6a6209f5e1ff8e6bd88b98dbb3a45354f95ef2a8 100644
--- a/applications/locale/de/fusiondirectory.po
+++ b/applications/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/el_GR/fusiondirectory.po b/applications/locale/el_GR/fusiondirectory.po
index 00ab19b3014dc97f45ea2449e692927a2dd2f1e0..25bffcd34c926664e70cf9a643d8449be79454f9 100644
--- a/applications/locale/el_GR/fusiondirectory.po
+++ b/applications/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -221,4 +221,5 @@ msgstr "Î›Î¯ÏƒÏ„Î± ÎµÏ†Î±ÏÎ¼Î¿Î³ÏŽÎ½"
 
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
-msgstr "ÎŸÎ¹ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Ï€Î¿Ï… Î¸Î±  ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÎµÎºÎºÎ¹Î½Î¿ÏÎ½Ï„Î±Î¹ Î±Ï€ÏŒ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ ÏÏŒÎ»Î¿"
+msgstr ""
+"ÎŸÎ¹ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Ï€Î¿Ï… Î¸Î±  ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÎµÎºÎºÎ¹Î½Î¿ÏÎ½Ï„Î±Î¹ Î±Ï€ÏŒ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ ÏÏŒÎ»Î¿"
diff --git a/applications/locale/en/fusiondirectory.po b/applications/locale/en/fusiondirectory.po
index ff444656c9713bbd4f9c9690d2773118d9cab937..ac995ecb19f560d56c7d3c8613039b372bafedb6 100644
--- a/applications/locale/en/fusiondirectory.po
+++ b/applications/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/applications/locale/es/fusiondirectory.po b/applications/locale/es/fusiondirectory.po
index 979019579872433664c4bc5c218e9e9653101c1c..55195d35796ec617d43996c636d6a818c7c4c15c 100644
--- a/applications/locale/es/fusiondirectory.po
+++ b/applications/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/es_CO/fusiondirectory.po b/applications/locale/es_CO/fusiondirectory.po
index 8f818e1d5c5cd21ba2b6ec850f2286b0faff1604..114082a445abe55267e8771d49f33393383b736a 100644
--- a/applications/locale/es_CO/fusiondirectory.po
+++ b/applications/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/es_VE/fusiondirectory.po b/applications/locale/es_VE/fusiondirectory.po
index 948743d28fa22cb765d1fb915e740da75e2f34b9..1dcc8b0f42280cf00477b8f4fb1a9e9de80a946f 100644
--- a/applications/locale/es_VE/fusiondirectory.po
+++ b/applications/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/fa_IR/fusiondirectory.po b/applications/locale/fa_IR/fusiondirectory.po
index 8f7fdbb754e519e326e2b10c986ca81e52b42c17..aead68f422b885b69f810820f020b60c40b65d26 100644
--- a/applications/locale/fa_IR/fusiondirectory.po
+++ b/applications/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/fi_FI/fusiondirectory.po b/applications/locale/fi_FI/fusiondirectory.po
index 1e9d16e5d1f6774bd24daa3ed3a3547574ec0518..7e8f6cc888b891f8d37f5728c33dfe946ef5a89f 100644
--- a/applications/locale/fi_FI/fusiondirectory.po
+++ b/applications/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -71,7 +72,7 @@ msgstr "Sovellusten hallinta"
 
 #: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
-msgstr "Web-sovellus"
+msgstr "Web-sovellukset"
 
 #: admin/applications/class_applicationGeneric.inc:29
 #: admin/applications/class_applicationGeneric.inc:32
diff --git a/applications/locale/fr/fusiondirectory.po b/applications/locale/fr/fusiondirectory.po
index 284b0f3e7bda9e39f5dae32627f7e176a5859257..e2132a81556e9b134a765a47157178e59fa82d06 100644
--- a/applications/locale/fr/fusiondirectory.po
+++ b/applications/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ã‰ric Deschamps <erdesc@free.fr>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,7 +56,7 @@ msgstr "Sâ€™il faut afficher les applications web dans le menu principal de FD"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "None"
-msgstr "Aucunes"
+msgstr "Aucun"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "Only allowed"
@@ -222,4 +221,5 @@ msgstr "List dâ€™applications"
 
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
-msgstr "Les applications que les utilisateurs avec ce rÃ´le sont autorisÃ©s Ã  exÃ©cuter"
+msgstr ""
+"Les applications que les utilisateurs avec ce rÃ´le sont autorisÃ©s Ã  exÃ©cuter"
diff --git a/applications/locale/hu_HU/fusiondirectory.po b/applications/locale/hu_HU/fusiondirectory.po
index 2d40a23e18d110d227088eeed991b0514f54dece..848a08aa3fae8e89afa4e01b52ee4b8ac225c2ce 100644
--- a/applications/locale/hu_HU/fusiondirectory.po
+++ b/applications/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/id/fusiondirectory.po b/applications/locale/id/fusiondirectory.po
index aa2610e3338b3345b39497f52c8baae7c0393591..f35c45793242b26ad70093adf357d4440210ad75 100644
--- a/applications/locale/id/fusiondirectory.po
+++ b/applications/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/it_IT/fusiondirectory.po b/applications/locale/it_IT/fusiondirectory.po
index d6798ace718756a5d8136de9a0bc9328014429e0..05186e30017c234f84751e555fc9d94627b70b97 100644
--- a/applications/locale/it_IT/fusiondirectory.po
+++ b/applications/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:23+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/lv/fusiondirectory.po b/applications/locale/lv/fusiondirectory.po
index 272f3149c6a44a992ac3e6ba2f650c9c34fd04cc..24b04fa4dccd47b624e8b6ef869251e1cc0c6f06 100644
--- a/applications/locale/lv/fusiondirectory.po
+++ b/applications/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/nb/fusiondirectory.po b/applications/locale/nb/fusiondirectory.po
index 5803f159aac76deba8117ee4a69195c9bff9f6f8..ea1a544243afde09a68f2541bf03e47a658ba5a9 100644
--- a/applications/locale/nb/fusiondirectory.po
+++ b/applications/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/nl/fusiondirectory.po b/applications/locale/nl/fusiondirectory.po
index bc03e5adbe036c33c6c956beec0cb7772942c782..595715fc677a38deec705a10e609f79b76b42e5e 100644
--- a/applications/locale/nl/fusiondirectory.po
+++ b/applications/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +28,11 @@ msgstr "Programma's"
 
 #: config/applications/class_applicationsPluginConfig.inc:29
 msgid "Applications plugin configuration"
-msgstr ""
+msgstr "Applicatie plugin configuratie"
 
 #: config/applications/class_applicationsPluginConfig.inc:43
 msgid "Application RDN"
-msgstr ""
+msgstr "Applicatie RDN"
 
 #: config/applications/class_applicationsPluginConfig.inc:43
 msgid "Branch in which applications will be stored"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Show web applications in menu"
-msgstr ""
+msgstr "Toon web applicaties in de menu"
 
 #: config/applications/class_applicationsPluginConfig.inc:53
 msgid "Whether to show web applications in FD main menu"
@@ -59,7 +60,7 @@ msgstr "Geen"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "Only allowed"
-msgstr ""
+msgstr "Alleen toegang"
 
 #: config/applications/class_applicationsPluginConfig.inc:56
 msgid "All"
@@ -71,7 +72,7 @@ msgstr "Programma beheer"
 
 #: admin/applications/class_applicationManagement.inc:85
 msgid "Web applications"
-msgstr ""
+msgstr "Web applicaties"
 
 #: admin/applications/class_applicationGeneric.inc:29
 #: admin/applications/class_applicationGeneric.inc:32
@@ -82,7 +83,7 @@ msgstr "Programma"
 
 #: admin/applications/class_applicationGeneric.inc:30
 msgid "Application information"
-msgstr ""
+msgstr "Informatie over de applicatie"
 
 #: admin/applications/class_applicationGeneric.inc:50
 msgid "Application name"
@@ -90,7 +91,7 @@ msgstr "Programmanaam"
 
 #: admin/applications/class_applicationGeneric.inc:50
 msgid "The name of this application"
-msgstr ""
+msgstr "De naam van deze applicatie"
 
 #: admin/applications/class_applicationGeneric.inc:54
 #: admin/applications/class_webApplication.inc:53
@@ -100,7 +101,7 @@ msgstr "Omschrijving"
 #: admin/applications/class_applicationGeneric.inc:54
 #: admin/applications/class_webApplication.inc:53
 msgid "A short description of this application"
-msgstr ""
+msgstr "Een korte beschrijving van de applicatie"
 
 #: admin/applications/class_applicationGeneric.inc:58
 msgid "Execute"
@@ -108,7 +109,7 @@ msgstr "Commando"
 
 #: admin/applications/class_applicationGeneric.inc:58
 msgid "The application to be executed"
-msgstr ""
+msgstr "De applicatie die wordt uitgevoerd"
 
 #: admin/applications/class_applicationGeneric.inc:62
 msgid "Display name"
@@ -116,7 +117,7 @@ msgstr "Getoonde naam"
 
 #: admin/applications/class_applicationGeneric.inc:62
 msgid "The displayed name for this application"
-msgstr ""
+msgstr "De getoonde naam van de applicatie"
 
 #: admin/applications/class_applicationGeneric.inc:68
 #: admin/applications/class_webApplication.inc:67
@@ -126,7 +127,7 @@ msgstr "Icoon"
 #: admin/applications/class_applicationGeneric.inc:71
 #: admin/applications/class_webApplication.inc:70
 msgid "The icon for this application"
-msgstr ""
+msgstr "Het icoon van de applicatie"
 
 #: admin/applications/class_applicationGeneric.inc:78
 msgid "Options"
@@ -172,7 +173,7 @@ msgstr "Plaats invoer in snelstartbalk van groepsleden"
 #: admin/applications/class_webApplication.inc:28
 #: admin/applications/class_webApplication.inc:31
 msgid "Web application"
-msgstr ""
+msgstr "Web applicatie"
 
 #: admin/applications/class_webApplication.inc:29
 msgid "Web applicationts names, icons and links"
@@ -184,7 +185,7 @@ msgstr "Naam"
 
 #: admin/applications/class_webApplication.inc:49
 msgid "Name or id for application"
-msgstr ""
+msgstr "Naam of id voor de applicatie"
 
 #: admin/applications/class_webApplication.inc:57
 msgid "URL"
@@ -192,7 +193,7 @@ msgstr "URL"
 
 #: admin/applications/class_webApplication.inc:57
 msgid "Link to this application"
-msgstr ""
+msgstr "Link naar deze applicatie"
 
 #: admin/applications/class_webApplication.inc:61
 msgid "Display Name"
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/applications/class_webApplication.inc:75
 msgid "Icon location"
-msgstr ""
+msgstr "Icoon locatie"
 
 #: admin/applications/class_webApplication.inc:75
 msgid "Usual path to this application icon"
@@ -216,7 +217,7 @@ msgstr ""
 
 #: admin/roles/class_applicationRights.inc:45
 msgid "Application list"
-msgstr ""
+msgstr "Applicatie lijst"
 
 #: admin/roles/class_applicationRights.inc:49
 msgid "The applications users with this role are allowed to launch"
diff --git a/applications/locale/pl/fusiondirectory.po b/applications/locale/pl/fusiondirectory.po
index cee5bf34082f1334465fb927f33ac36b85ea49aa..f02b9d7d43643b5deb85dcef00d0d4fb5da11573 100644
--- a/applications/locale/pl/fusiondirectory.po
+++ b/applications/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/pt/fusiondirectory.po b/applications/locale/pt/fusiondirectory.po
index f4d7eda10382c0ee8378d38e3577b2fcb6337cc1..a1d886e60d55cec3297b58e966126477a2668daf 100644
--- a/applications/locale/pt/fusiondirectory.po
+++ b/applications/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/pt_BR/fusiondirectory.po b/applications/locale/pt_BR/fusiondirectory.po
index 715af57e98f31c45027c92ac58709b5130a4cf10..2943c15cbb826f04d08eedf945392ced25dc6ee3 100644
--- a/applications/locale/pt_BR/fusiondirectory.po
+++ b/applications/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/ru/fusiondirectory.po b/applications/locale/ru/fusiondirectory.po
index 8c44c20b76b026335dc79c1749f5e4b7b53420f3..8d35b13eb621fcd1a5a09971a0eb4767eb089acb 100644
--- a/applications/locale/ru/fusiondirectory.po
+++ b/applications/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/ru@petr1708/fusiondirectory.po b/applications/locale/ru@petr1708/fusiondirectory.po
index 3393b9e5bff0f0aafdcb57e12e3a657e4d56dd92..90ed2fa48873130a16191cf7fbce4a26e755e97c 100644
--- a/applications/locale/ru@petr1708/fusiondirectory.po
+++ b/applications/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/sv/fusiondirectory.po b/applications/locale/sv/fusiondirectory.po
index d4bbf20f1f6d28bf7410dc72e14c0456f7cffb66..7e6666c1e777b135b158d4598797f8c9a74572fd 100644
--- a/applications/locale/sv/fusiondirectory.po
+++ b/applications/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/ug/fusiondirectory.po b/applications/locale/ug/fusiondirectory.po
index 031b1f599057120ff3a72d04154562d4cd7340a6..66ebec618efa27fc5b8d983041c82ea02831f196 100644
--- a/applications/locale/ug/fusiondirectory.po
+++ b/applications/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/vi_VN/fusiondirectory.po b/applications/locale/vi_VN/fusiondirectory.po
index 7bd2f730fd943ea2573639d37960887a2a3ca699..2cc63f3a006e482d099d4fa24ff1b5c1c1fdd358 100644
--- a/applications/locale/vi_VN/fusiondirectory.po
+++ b/applications/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/applications/locale/zh/fusiondirectory.po b/applications/locale/zh/fusiondirectory.po
index 9e3a5d0db550901f0776a868d82e14b6bb080920..b366670b8eded68a802361c29b5ab7b77d3ef366 100644
--- a/applications/locale/zh/fusiondirectory.po
+++ b/applications/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/argonaut/addons/argonaut/class_argonautEventTypes.inc b/argonaut/addons/argonaut/class_argonautEventTypes.inc
index 88e86d7dfa04b8d40e333a1ee612c9a4b9b7bf74..8f8d812b513614c1e272e7b361c381782e571fca 100644
--- a/argonaut/addons/argonaut/class_argonautEventTypes.inc
+++ b/argonaut/addons/argonaut/class_argonautEventTypes.inc
@@ -20,11 +20,6 @@
 
 class argonautEventTypes
 {
-  static protected function get_event_types_list()
-  {
-    die('get_event_types_list needs to be implemented in all subclass of argonautEventTypes');
-  }
-
   /*! \brief  Returns a complete list of all available events.
     @return   Array   Containing info for all available events.
    */
@@ -36,7 +31,7 @@ class argonautEventTypes
     } else {
       $ret = array();
       foreach (array_keys($class_mapping) as $class) {
-        if (is_subclass_of($class, 'argonautEventTypes')) {
+        if (preg_match('/^argonautEventTypes.+$/', $class)) {
           $ret = array_merge($ret, $class::get_event_types_list());
         }
       }
@@ -63,9 +58,9 @@ class argonautEventTypes
   }
 }
 
-class argonautEventSystem extends argonautEventTypes
+class argonautEventTypesSystem
 {
-  static protected function get_event_types_list()
+  static public function get_event_types_list()
   {
     return array(
       'System.halt' => array(
@@ -76,9 +71,9 @@ class argonautEventSystem extends argonautEventTypes
   }
 }
 
-class argonautEventDeployment extends argonautEventTypes
+class argonautEventTypesDeployment
 {
-  static protected function get_event_types_list()
+  static public function get_event_types_list()
   {
     return array(
       'Deployment.reboot' => array(
@@ -101,7 +96,7 @@ class argonautEventDeployment extends argonautEventTypes
   }
 }
 
-class argonautEventLdap2zone extends argonautEventTypes
+class argonautEventTypesLdap2zone
 {
   static public function get_event_types_list()
   {
diff --git a/argonaut/addons/argonaut/class_argonautImportFile.inc b/argonaut/addons/argonaut/class_argonautImportFile.inc
index 3cb00029c8f19ca8449d667a0e11c54ea5ff5942..ff339af0e9ff886eb399e7ca68dec3adde6b3718 100644
--- a/argonaut/addons/argonaut/class_argonautImportFile.inc
+++ b/argonaut/addons/argonaut/class_argonautImportFile.inc
@@ -78,6 +78,7 @@ class argonautImportFile extends simplePlugin
 
   public function __construct($parent)
   {
+    global $config;
     parent::__construct($config->current['BASE'], NULL, $parent);
 
     $this->attributesAccess['import']->setInLdap(FALSE);
diff --git a/argonaut/addons/argonaut/class_argonautQueue.inc b/argonaut/addons/argonaut/class_argonautQueue.inc
index a5a323a3d6fa8cc6734e03e41824c6365d117b9d..e32418fe06bda10a9aa8f785f877dd4581c2af16 100644
--- a/argonaut/addons/argonaut/class_argonautQueue.inc
+++ b/argonaut/addons/argonaut/class_argonautQueue.inc
@@ -87,7 +87,7 @@ class argonautQueue extends simpleManagement
   /*! \brief    Queue selected objects to be removed.
    *            Checks ACLs, Locks and ask for confirmation.
    */
-  protected function removeEntryRequested($action = '', $target = array(), $all = array())
+  protected function removeEntryRequested($action, array $target, array $all)
   {
     if (!$this->acl_is_removeable()) {
       msg_dialog::display(_('Permission'), msgPool::permDelete(), ERROR_DIALOG);
@@ -135,14 +135,14 @@ class argonautQueue extends simpleManagement
         if ($infos) {
           $objects[] = array(
             'name'  => $infos['name'],
-            'dn'    => LDAP::fix($dn),
+            'dn'    => $dn,
             'icon'  => $infos['img'],
             'type'  => 'task'
           );
         } else {
           $objects[] = array(
             'name'  => $task['HEADERTAG'],
-            'dn'    => LDAP::fix($dn),
+            'dn'    => $dn,
             'icon'  => '',
             'type'  => 'task'
           );
@@ -157,8 +157,7 @@ class argonautQueue extends simpleManagement
     }
   }
 
-  function removeEntryConfirmed($action = '', $target = array(), $all = array(),
-                                $altTabClass = '', $altTabType = '', $altAclCategory = '')
+  function removeEntryConfirmed($action, array $target, array $all)
   {
     if ($this->acl_is_removeable()) {
       timezone::get_default_timezone();
@@ -173,7 +172,7 @@ class argonautQueue extends simpleManagement
 
   /*! \brief  Force queue job to be aborted.
    */
-  function abortEvent($action = '', $target = array(), $all = array())
+  function abortEvent($action, array $target)
   {
     $macs     = array();
     $taskids  = array();
@@ -188,30 +187,26 @@ class argonautQueue extends simpleManagement
     if ($this->o_queue->is_error()) {
       msg_dialog::display(_('Info'), sprintf(_('%s'), $this->o_queue->get_error()), INFO_DIALOG);
     }
-    /* Removing the task. */
+    // Removing the task.
     $this->o_queue->remove_entries($taskids);
   }
 
-  function processNow($action = '', $target = array(), $all = array())
+  function processNow($action, array $target)
   {
     $this->execute_queue_entries($target);
   }
 
-  function viewLogs($action = '', $target = array(), $all = array())
+  function viewLogs($action, array $target)
   {
     if (count($target) == 1) {
-      $id       = $target[0];
-      $type     = FALSE;
-      $headpage = $this->getHeadpage();
-      $tmp      = $headpage->getEntry($id);
-      $entry    = $tmp['EVENT'];
+      $entry        = $this->getHeadpage()->getEntry($target[0]);
       $attrsWrapper = new stdClass();
-      $attrsWrapper->attrs = $entry;
+      $attrsWrapper->attrs = $entry['EVENT'];
       $this->dialogObject = new faiLogView(NULL, '', $attrsWrapper, $this);
     }
   }
 
-  function showErrorEntry($action = '', $target = array(), $all = array())
+  function showErrorEntry($action, array $target)
   {
     if (count($target) == 1) {
       $entry  = $this->headpage->getEntry($target[0]);
diff --git a/argonaut/addons/argonaut/import_events.tpl b/argonaut/addons/argonaut/import_events.tpl
index ec36261fdc62c8c9645d31f515bc9ce2ec6dcab5..a8e6844339aec162638517332680628750a6f316 100644
--- a/argonaut/addons/argonaut/import_events.tpl
+++ b/argonaut/addons/argonaut/import_events.tpl
@@ -3,7 +3,7 @@
     {$section}
   </span>
   <div>
-    {if $attributes.events|@count < 1}
+    {if $attributes.events|@count == 0}
       <p>
       {t}You can import a list of jobs into the FusionDirectory job queue. This should be a semicolon seperated list of items in the following format:{/t}<br/><br/>
       <i>{t}timestamp{/t};{t}MAC-address{/t};{t}job type{/t};[{t}object group{/t}]</i><br/><br/>
diff --git a/argonaut/admin/systems/argonaut/class_argonautClient.inc b/argonaut/admin/systems/argonaut/class_argonautClient.inc
index 11dbc44d73f694841e1241f7d3c2ae870ace4cce..ab032a63716afc22d5d320d29595bf02b106be16 100644
--- a/argonaut/admin/systems/argonaut/class_argonautClient.inc
+++ b/argonaut/admin/systems/argonaut/class_argonautClient.inc
@@ -117,7 +117,7 @@ class argonautClient extends simplePlugin
       'plShortName'     => _('Argonaut client'),
       'plDescription'   => _('Edit argonaut client settings'),
       'plSelfModify'    => FALSE,
-      'plObjectType'    => array('workstation','server','ogroup-dynamic'),
+      'plObjectType'    => array('workstation','server','terminal','ogroup-dynamic'),
 
       '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 1f3eb3dcdf2d9fedc45633c4df9649261cdd5e17..549a47aa547b31ec386c7b9cf144a1ab8a08c0f3 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautDNSConfig.inc
@@ -84,9 +84,10 @@ class argonautDNSConfig extends simpleService
             _('Ignore reverse zone'), _('Do not write reverse zone'),
             'argonautLdap2zoneNoReverse', FALSE
           ),
-          new BooleanAttribute (
-            _('Allow notify'), '',
-            'argonautLdap2zoneAllowNotify', FALSE
+          new SelectAttribute (
+            _('Notify'), '',
+            'argonautLdap2zoneNotify', FALSE,
+            array('yes','no','explicit')
           ),
           new StringAttribute (
             _('Allow update'), _('Allow update (semicolon separated and ended)'),
@@ -113,7 +114,7 @@ class argonautDNSConfig extends simpleService
               'argonautLdap2zoneSlaveZones',
               array(
                 new StringAttribute(
-                  _('zone'), _('DNS zone(s) to be stored as a slave on this server'),
+                  _('zone'), _('DNS zone this server should be declared as slave of'),
                   'Ldap2zoneSlaveZone', TRUE
                 ),
                 new StringAttribute(
diff --git a/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc b/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
index 610d45a6f1d570aecd6bf70e45e77e51aaa57002..d3eebcf80ff4f38e4504b5d54e2da9d0142c2e2a 100644
--- a/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
+++ b/argonaut/admin/systems/services/argonaut/class_argonautFuseConfig.inc
@@ -170,15 +170,21 @@ class argonautFuseConfig extends simpleService
   /* Save to LDAP */
   function save()
   {
-    parent::save();
+    $errors = parent::save();
+    if (!empty($errors)) {
+      return $errors;
+    }
     /* Save objects */
     foreach ($this->plugin as &$plugin) {
       $plugin->dn = $this->dn;
 
       if ($plugin->is_account) {
-        $plugin->save();
+        $errors = $plugin->save();
       } else {
-        $plugin->remove_from_parent();
+        $errors = $plugin->remove_from_parent();
+      }
+      if (!empty($errors)) {
+        msg_dialog::displayChecks($errors);
       }
     }
     unset($plugin);
@@ -186,13 +192,21 @@ class argonautFuseConfig extends simpleService
 
   function remove_from_parent()
   {
+    $errors = array();
     /* Remove objects */
     foreach ($this->plugin as &$plugin) {
       $plugin->dn = $this->dn;
-      $plugin->remove_from_parent();
+      $result = $plugin->remove_from_parent();
+      if (!empty($result)) {
+        $errors = array_merge($errors, $result);
+      }
     }
     unset($plugin);
-    parent::remove_from_parent();
+    $result = parent::remove_from_parent();
+    if (!empty($result)) {
+      $errors = array_merge($result, $errors);
+    }
+    return $errors;
   }
 }
 ?>
diff --git a/argonaut/contrib/openldap/argonaut-fd.schema b/argonaut/contrib/openldap/argonaut-fd.schema
index 347cd931a7c37586e053346928c12761c4cbb162..9d46a8386269359d772cf9e3d335162efc556f73 100644
--- a/argonaut/contrib/openldap/argonaut-fd.schema
+++ b/argonaut/contrib/openldap/argonaut-fd.schema
@@ -205,6 +205,7 @@ attributetype ( 1.3.6.1.4.1.38414.2.13.1 NAME 'argonautLdap2zoneBindDir'
 
 attributetype ( 1.3.6.1.4.1.38414.2.13.2 NAME 'argonautLdap2zoneAllowNotify'
   DESC 'Fusion Directory - Argonaut, allow notify.'
+  OBSOLETE
   EQUALITY booleanMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE )
@@ -264,6 +265,12 @@ attributetype ( 1.3.6.1.4.1.38414.2.13.11 NAME 'argonautLdap2zoneSlaveZones'
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
+attributetype ( 1.3.6.1.4.1.38414.2.13.12 NAME 'argonautLdap2zoneNotify'
+  DESC 'Fusion Directory - Argonaut, notify - should be yes, no or explicit.'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE )
+
 attributetype ( 1.3.6.1.4.1.38414.2.14.1 NAME 'argonautFuseDefaultMode'
   DESC 'Fusion Directory - Argonaut, fuse default mode.'
   EQUALITY caseExactIA5Match
@@ -384,11 +391,11 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.4 NAME 'argonautDNSConfig'
   DESC 'An argonaut config for ldap2zone'
   SUP top AUXILIARY
   MUST (
-    argonautLdap2zoneBindDir  $ argonautLdap2zoneBindCacheDir $ argonautLdap2zoneAllowNotify $
+    argonautLdap2zoneBindDir  $ argonautLdap2zoneBindCacheDir $
     argonautLdap2zoneTTL      $ argonautLdap2zoneRndc )
   MAY ( argonautLdap2zoneAllowUpdate $ argonautLdap2zoneAllowTransfer $
     argonautLdap2zoneNoReverse $ argonautLdap2zoneCheckNames $ argonautLdap2zoneSearchBase $
-    argonautLdap2zoneSlaveZones ) )
+    argonautLdap2zoneSlaveZones $ argonautLdap2zoneNotify $ argonautLdap2zoneAllowNotify ) )
 
 objectclass ( 1.3.6.1.4.1.38414.2.2.5 NAME 'argonautFuseConfig'
   DESC 'An argonaut config for fuse'
diff --git a/argonaut/include/class_supportDaemon.inc b/argonaut/include/class_supportDaemon.inc
index 0714af4e6f999c0ebee641fe8e67407afd4fc0e1..24585cab4a40ad940631ead0588a906fe4439898 100644
--- a/argonaut/include/class_supportDaemon.inc
+++ b/argonaut/include/class_supportDaemon.inc
@@ -142,7 +142,7 @@ class supportDaemon
         $this->set_error("Received $test, expected $ok");
         return $this->new_state(FALSE);
       }
-    } catch (Exception $e) {
+    } catch (jsonRPCClientException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -221,12 +221,12 @@ class supportDaemon
       $this->reset_error();
       $this->new_state(TRUE);
       return $status[0];
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+      // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -296,23 +296,29 @@ class supportDaemon
   {
     global $config;
     timezone::get_default_timezone();
-    $entries_r = array();
+    $entries_r  = array();
+    $macToCn    = array();
+    $ldap       = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
     foreach ($entries as &$entry) {
       $entry_r['TIMESTAMP']   = date('YmdHis', $entry['data']['timestamp']);
       $entry_r['MACADDRESS']  = $entry['target'];
 
-      // TODO : do an ldap search only if we haven't done it for the same mac before
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search('(macAddress='.$entry_r['MACADDRESS'].')', array('cn'));
-      if ($ldap_infos = $ldap->fetch()) {
-        $entry_r['PLAINNAME'] = $ldap_infos['cn'][0];
+      /* Do an ldap search only if we haven't done it for the same mac before */
+      if (isset($macToCn[$entry_r['MACADDRESS']])) {
+        $entry_r['PLAINNAME'] = $macToCn[$entry_r['MACADDRESS']];
+      } else {
+        $ldap->search('(macAddress='.$entry_r['MACADDRESS'].')', array('cn'));
+        if ($ldap_infos = $ldap->fetch()) {
+          $macToCn[$entry_r['MACADDRESS']]  = $ldap_infos['cn'][0];
+          $entry_r['PLAINNAME']             = $ldap_infos['cn'][0];
+        }
       }
 
       $entry_r['ERROR']     = $entry['error'];
       $entry_r['PROGRESS']  = $entry['progress'];
 
-      $entry_r['PERIODIC']  = (isset($entry['data']['periodic'])?$entry['data']['periodic']:NULL);
+      $entry_r['PERIODIC']  = (isset($entry['data']['periodic']) ? $entry['data']['periodic'] : NULL);
       $entry_r['STATUS']    = $entry['status'];
       $entry_r['SUBSTATUS'] = $entry['substatus'];
       $entry_r['ID']        = $entry['id'];
@@ -343,7 +349,7 @@ class supportDaemon
     try {
       $client = new jsonRPCClient($this->s_host, $this->http_options, $this->ssl_options);
       $entries = $client->get_entries();
-    } catch (Exception $e) {
+    } catch (jsonRPCClientException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -391,12 +397,12 @@ class supportDaemon
       $client->remove_entries($ids);
       $this->reset_error();
       return $this->new_state(TRUE);
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+      // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -452,12 +458,12 @@ class supportDaemon
       $client->process_entries_now($ids);
       $this->reset_error();
       return $this->new_state(TRUE);
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+       // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -527,12 +533,12 @@ class supportDaemon
       $this->reset_error();
       $this->new_state(TRUE);
       return $entries;
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+      // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -629,12 +635,12 @@ class supportDaemon
       $this->reset_error();
       $this->new_state(TRUE);
       return $client->ping($mac);
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+      // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
@@ -667,7 +673,8 @@ class supportDaemon
     if ($this->saved_state() == FALSE) {
       return array();
     }
-    /* filters is a package name list */
+
+    // filters is a package name list
     if ($package_list) {
       foreach ($filters as &$filter) {
         $filter = "^".$this->escape_perl_chars($filter)."$";
@@ -692,7 +699,7 @@ class supportDaemon
         }
         if (in_array("SECTION", $attrs)) {
           foreach ($packages as &$package) {
-            /* FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance */
+            // FIXME : do we want to do this? It will replace "contrib/misc by contrib, for instance
             $package['SECTION'] = $section;
           }
           unset($package);
@@ -702,12 +709,12 @@ class supportDaemon
       $this->reset_error();
       $this->new_state(TRUE);
       return $to_return;
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+       // connection is OK
       $this->new_state(TRUE);
       return array();
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       $this->new_state(FALSE);
       return array();
@@ -767,12 +774,12 @@ class supportDaemon
       $taskids = $client->get_entries_by_mac(array($mac));
       $client->remove_entries($taskids);
       return $this->new_state(TRUE);
-    } catch (jsonRPCClient_RequestErrorException $e) {
+    } catch (jsonRPCClientRequestErrorException $e) {
       $this->set_error($e->getMessage());
-      /* connection is OK */
+      // connection is OK
       $this->new_state(TRUE);
       return FALSE;
-    } catch (jsonRPCClient_NetworkErrorException $e) {
+    } catch (jsonRPCClientNetworkErrorException $e) {
       $this->set_error($e->getMessage());
       return $this->new_state(FALSE);
     }
diff --git a/argonaut/include/jsonRPCClient.php b/argonaut/include/jsonRPCClient.php
index 683c0cba254ffb93afe57cdf661674642ea4ba58..2b768217e3d70a9f036c27d55dcc81a809a6f848 100644
--- a/argonaut/include/jsonRPCClient.php
+++ b/argonaut/include/jsonRPCClient.php
@@ -27,11 +27,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * Source code for class jsonRPCClient
  */
 
-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 {}
+class jsonRPCClientException extends Exception {}
+class jsonRPCClientRequestErrorException extends jsonRPCClientException {}
+class jsonRPCClientNetworkErrorException extends jsonRPCClientException {}
+class jsonRPCClientProtocolException extends jsonRPCClientException {}
+class jsonRPCClientBadArgsException extends jsonRPCClientException {}
 
 /*!
  * \brief The object of this class are generic jsonRPC 1.0 clients
@@ -140,7 +140,7 @@ class jsonRPCClient {
 
     // check
     if (!is_scalar($method)) {
-      throw new jsonRPCClient_BadArgsException('Method name has no scalar value');
+      throw new jsonRPCClientBadArgsException('Method name has no scalar value');
     }
 
     // check
@@ -148,7 +148,7 @@ class jsonRPCClient {
       // no keys
       $params = array_values($params);
     } else {
-      throw new jsonRPCClient_BadArgsException('Params must be given as array');
+      throw new jsonRPCClientBadArgsException('Params must be given as array');
     }
 
     // sets notification or request task
@@ -195,7 +195,7 @@ class jsonRPCClient {
       } else {
         $errormsg = 'Unable to connect to '.$this->url;
       }
-      throw new jsonRPCClient_NetworkErrorException($errormsg);
+      throw new jsonRPCClientNetworkErrorException($errormsg);
     }
 
     // debug output
@@ -208,15 +208,15 @@ class jsonRPCClient {
         case JSON_ERROR_NONE:
         break;
         case JSON_ERROR_DEPTH:
-          throw new jsonRPCClient_ProtocolException('Maximum depth in response');
+          throw new jsonRPCClientProtocolException('Maximum depth in response');
         case JSON_ERROR_STATE_MISMATCH:
-          throw new jsonRPCClient_ProtocolException('Invalid JSON in response');
+          throw new jsonRPCClientProtocolException('Invalid JSON in response');
         case JSON_ERROR_CTRL_CHAR:
-          throw new jsonRPCClient_ProtocolException('Error while checking chars in response');
+          throw new jsonRPCClientProtocolException('Error while checking chars in response');
         case JSON_ERROR_SYNTAX:
-          throw new jsonRPCClient_ProtocolException('Bad JSON syntax in response');
+          throw new jsonRPCClientProtocolException('Bad JSON syntax in response');
         case JSON_ERROR_UTF8:
-          throw new jsonRPCClient_ProtocolException('Bad UTF-8 in response');
+          throw new jsonRPCClientProtocolException('Bad UTF-8 in response');
         default:
         break;
       }
@@ -226,10 +226,10 @@ class jsonRPCClient {
     if (!$this->notification) {
       // check
       if ($response['id'] != $currentId) {
-        throw new jsonRPCClient_ProtocolException('Incorrect response id (request id: '.$currentId.', response id: '.$response['id'].')');
+        throw new jsonRPCClientProtocolException('Incorrect response id (request id: '.$currentId.', response id: '.$response['id'].')');
       }
       if (!is_null($response['error'])) {
-        throw new jsonRPCClient_RequestErrorException('Request error: '.$response['error']);
+        throw new jsonRPCClientRequestErrorException('Request error: '.$response['error']);
       }
 
       return $response['result'];
diff --git a/argonaut/locale/ar/fusiondirectory.po b/argonaut/locale/ar/fusiondirectory.po
index 5929e6db2974c693cf9f3ab9db467e5ad7d14c96..95c700c7cdd925be9823795a77f00cae2710db76 100644
--- a/argonaut/locale/ar/fusiondirectory.po
+++ b/argonaut/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Ø¥Ø²Ø§Ù„Ø©"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙŠÙ„"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ca/fusiondirectory.po b/argonaut/locale/ca/fusiondirectory.po
index f9c843c1962ead935a2a9ac12ab7a239a81faebb..a3c74e302b91c911e5819819836413ffbf83c6c6 100644
--- a/argonaut/locale/ca/fusiondirectory.po
+++ b/argonaut/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Error"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/cs_CZ/fusiondirectory.po b/argonaut/locale/cs_CZ/fusiondirectory.po
index 46f1517d4acf5db8fc0ffe377c15c2fc2e5bbdb0..ae0d8b532ef3ea63ee0450eb73a6a5f86d7da904 100644
--- a/argonaut/locale/cs_CZ/fusiondirectory.po
+++ b/argonaut/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr "Nalezeno vÃce argonaut serverÅ¯. PouÅ¾it je moÅ¾nÃ© ale pouze jeden"
 msgid "There is no argonaut server configured"
 msgstr "NenÃ nastaven Å¾Ã¡dnÃ½ argonaut server"
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Nelze naÄÃst %s!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "%s nenÃ soubor!"
@@ -47,91 +48,92 @@ msgstr "Poskytuje mechanizmus pro samoÄinnou aktivaci systÃ©mÅ¯"
 
 #: addons/argonaut/class_argonautQueue.inc:93
 msgid "Permission"
-msgstr "OprÃ¡vnÄ›nÃ"
+msgstr "oprÃ¡vnÄ›nÃ"
 
 #: addons/argonaut/class_argonautQueue.inc:123
 #: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
 msgid "Remove"
-msgstr "Odstranit"
+msgstr "odebrat"
 
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Tyto Ãºlohy nemohly bÃ½t smazÃ¡ny, protoÅ¾e musÃ bÃ½t nejprve pÅ™eruÅ¡eny: %s"
+msgstr ""
+"Tyto Ãºlohy nemohly bÃ½t smazÃ¡ny, protoÅ¾e musÃ bÃ½t nejprve pÅ™eruÅ¡eny: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
-msgstr "Informace"
+msgstr "informace"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
-msgstr "Podrobnosti chyby"
+msgstr "podrobnosti chyby"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Nelze aktualizovat poloÅ¾ky fronty."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "okamÅ¾itÄ›"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
-msgstr "ÄŒekajÃcÃ"
+msgstr "ÄekÃ¡nÃ"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
-msgstr "Zobrazit chybu"
+msgstr "zobrazit chybu"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
-msgstr "ZpracovanÃ©"
+msgstr "zpracovanÃ©"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "probÃhÃ¡"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
-msgstr "Vypnout"
+msgstr "vypnout"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
-msgstr "Restartovat"
+msgstr "restartartovat"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "zapnout na dÃ¡lku"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
-msgstr "Aktualizace programovÃ©ho vybavenÃ"
+msgstr "aktualizace softwaru"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(PÅ™e)Instalovat"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
 #: addons/argonaut/class_argonautAction.inc:27
 #: addons/argonaut/class_argonautAction.inc:126
 msgid "Hours"
-msgstr "Hodiny"
+msgstr "hodiny"
 
 #: addons/argonaut/class_argonautAction.inc:32
 #: addons/argonaut/class_argonautAction.inc:126
@@ -144,7 +146,7 @@ msgstr ""
 
 #: addons/argonaut/class_argonautAction.inc:53
 msgid "Date"
-msgstr "Datum"
+msgstr "datum"
 
 #: addons/argonaut/class_argonautAction.inc:58
 msgid "Time"
@@ -192,7 +194,7 @@ msgstr "mÄ›sÃce"
 #: addons/argonaut/class_argonautAction.inc:132
 #: addons/argonaut/deploy-list.xml:43
 msgid "Period"
-msgstr "ObdobÃ"
+msgstr "interval"
 
 #: addons/argonaut/class_argonautAction.inc:137
 msgid "Targets"
@@ -204,53 +206,53 @@ msgstr ""
 
 #: addons/argonaut/deploy-list.xml:10
 msgid "List of queued jobs"
-msgstr "Seznam Ãºloh ve frontÄ›"
+msgstr "seznam Ãºloh ve frontÄ›"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
-msgstr "UdÃ¡lost"
+msgstr "udÃ¡lost"
 
 #: addons/argonaut/deploy-list.xml:27
 msgid "Target"
-msgstr "CÃl"
+msgstr "cÃl"
 
 #: addons/argonaut/deploy-list.xml:35
 msgid "Task"
-msgstr "Ãškol"
+msgstr "Ãºkol"
 
 #: addons/argonaut/deploy-list.xml:59
 msgid "Status"
-msgstr "Stav"
+msgstr "stav"
 
 #: addons/argonaut/deploy-list.xml:67
 msgid "Actions"
-msgstr "Akce"
+msgstr "akce"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
-msgstr "Import"
+msgstr "import(ovat)"
 
 #: addons/argonaut/deploy-list.xml:97 addons/argonaut/deploy-list.xml:144
 msgid "Abort"
-msgstr "PÅ™eruÅ¡it"
+msgstr "pÅ™eruÅ¡it"
 
 #: addons/argonaut/deploy-list.xml:108
 msgid "Execute"
-msgstr "Spustit"
+msgstr "spustit"
 
 #: addons/argonaut/deploy-list.xml:120
 msgid "Process now"
-msgstr "Zpracovat nynÃ"
+msgstr "zpracovat nynÃ"
 
 #: addons/argonaut/deploy-list.xml:128
 msgid "View logs"
-msgstr "Zobrazit protokoly"
+msgstr "Zobrazit provoznÃ zÃ¡znamy"
 
 #: addons/argonaut/class_argonautImportFile.inc:33
 #: addons/argonaut/class_argonautImportFile.inc:36
@@ -271,7 +273,7 @@ msgstr ""
 
 #: addons/argonaut/class_argonautImportFile.inc:63
 msgid "Upload"
-msgstr "NahrÃ¡t"
+msgstr "nahrÃ¡t"
 
 #: addons/argonaut/class_argonautImportFile.inc:67
 msgid "Import file"
@@ -281,24 +283,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
-msgstr "SluÅ¾ba Infrastruktura"
+msgstr "SluÅ¾ba infrastruktury"
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Import byl dokonÄen: %s udÃ¡lostÃ ÃºspÄ›Å¡nÄ› zaslÃ¡no, %s se nezdaÅ™ilo"
+msgstr "importovÃ¡nÃ bylo dokonÄeno: %s udÃ¡lostÃ ÃºspÄ›Å¡nÄ› zaslÃ¡no, %s selhalo"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "soubor je prÃ¡zdnÃ½"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC adresa"
@@ -306,7 +308,7 @@ msgstr "MAC adresa"
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #, php-format
 msgid "Cannot load queue entries: %s"
-msgstr "NedaÅ™Ã se naÄÃst poloÅ¾ky fronty: %s"
+msgstr "nelze naÄÃst poloÅ¾ky fronty: %s"
 
 #: admin/systems/argonaut/class_argonautClient.inc:117
 msgid "Argonaut client"
@@ -318,7 +320,7 @@ msgstr "Upravit nastavenÃ argonaut klienta"
 
 #: admin/systems/argonaut/class_argonautClient.inc:131
 msgid "Argonaut client settings"
-msgstr "NastavenÃ Argonaut klienta"
+msgstr "nastavenÃ Argonaut klienta"
 
 #: admin/systems/argonaut/class_argonautClient.inc:134
 msgid "Client port"
@@ -344,7 +346,7 @@ msgstr "RozhranÃ pro probouzenÃ po sÃti (WoL)"
 
 #: admin/systems/argonaut/class_argonautClient.inc:144
 msgid "Interface used by argonaut for WakeOnLan"
-msgstr "RozhranÃ pouÅ¾itÃ© komponentou argonaut pro probouzenÃ strojÅ¯ po sÃti (WoL)"
+msgstr "RozhranÃ, pouÅ¾itÃ© komponentou argonaut pro WakeOnLan"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "TaskId file"
@@ -352,18 +354,22 @@ msgstr "TaskId soubor"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Soubor, kterÃ½ bude argonaut pouÅ¾Ãvat pro uklÃ¡dÃ¡nÃ identifikÃ¡torÅ¯ svÃ½ch Ãºloh pÅ™i zavÃ¡dÄ›nÃ systÃ©mu"
+msgstr ""
+"Soubor, kterÃ½ bude argonaut pouÅ¾Ãvat pro uklÃ¡dÃ¡nÃ identifikÃ¡torÅ¯ svÃ½ch Ãºloh "
+"pÅ™i zavÃ¡dÄ›nÃ systÃ©mu"
 
 #: 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 "SloÅ¾ka pro soubory se zÃ¡znamy udÃ¡lostÃ"
+msgstr "sloÅ¾ka pro protokolovacÃ zÃ¡znamy"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 msgid "Directory in which argonaut client should write its logs"
-msgstr "SloÅ¾ka, do kterÃ© by argonaut klient mÄ›l uklÃ¡dat svÃ© soubory se zÃ¡znamem udÃ¡lostÃ"
+msgstr ""
+"SloÅ¾ka, do kterÃ© by argonaut klient mÄ›l uklÃ¡dat svÃ© soubory se zÃ¡znamem "
+"udÃ¡lostÃ"
 
 #: admin/systems/argonaut/class_argonautClient.inc:161
 #: admin/systems/services/argonaut/class_argonautServer.inc:103
@@ -425,7 +431,7 @@ msgstr "NastavenÃ Fuse OPSI modulu pro Argonaut"
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
@@ -437,7 +443,7 @@ msgstr "ÃºÄet sprÃ¡vce Opsi"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:55
 msgid "Opsi password"
-msgstr "Heslo k Opsi"
+msgstr "heslo k tomuto ÃºÄtu"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:60
 msgid "Opsi server"
@@ -458,11 +464,12 @@ msgstr "FAI"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:50
 msgid "Fai flags"
-msgstr "PÅ™Ãznaky FAI"
+msgstr "pÅ™Ãznaky FAI"
 
 #: admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc:57
 msgid "NFS root"
-msgstr "koÅ™en struktury sloÅ¾ek, nachÃ¡zejÃcÃ se na sÃÅ¥ovÃ©m souborovÃ©m systÃ©mu (NFS)"
+msgstr ""
+"koÅ™en struktury sloÅ¾ek, nachÃ¡zejÃcÃ se na sÃÅ¥ovÃ©m souborovÃ©m systÃ©mu (NFS)"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:30
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:31
@@ -528,68 +535,72 @@ msgid "Do not write reverse zone"
 msgstr "Nezapisovat do reverznÃ zÃ³ny"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Zapnout upozorÅˆovÃ¡nÃ"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
-msgstr "povolena aktualizace (poloÅ¾ky je tÅ™eba oddÄ›lovat a celÃ½ seznam zakonÄit stÅ™ednÃkem â€“ â€ž;â€œ )"
+msgstr ""
+"povolena aktualizace (poloÅ¾ky je tÅ™eba oddÄ›lovat a celÃ½ seznam zakonÄit "
+"stÅ™ednÃkem â€“ â€ž;â€œ )"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
-msgstr "povolen pÅ™enos (poloÅ¾ky je tÅ™eba oddÄ›lovat a celÃ½ seznam zakonÄit stÅ™ednÃkem â€“ â€ž;â€œ )"
+msgstr ""
+"povolen pÅ™enos (poloÅ¾ky je tÅ™eba oddÄ›lovat a celÃ½ seznam zakonÄit stÅ™ednÃkem"
+" â€“ â€ž;â€œ )"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -604,7 +615,7 @@ msgstr "LTSP"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
 msgid "LTSP server"
-msgstr "LinuxovÃ½ terminÃ¡lovÃ½ server (LTSP)"
+msgstr "server LTSP (linuxovÃ½ terminÃ¡lovÃ½ server)"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:30
 msgid "Argonaut Fuse"
@@ -620,7 +631,7 @@ msgstr "ZÃ¡kladnÃ nastavenÃ"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:48
 msgid "Default mode"
-msgstr "VÃ½chozÃ reÅ¾im"
+msgstr "vÃ½chozÃ reÅ¾im"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
 msgid "Directory in which argonaut-fuse will store its log"
@@ -632,7 +643,7 @@ msgstr "TFTP"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
 msgid "Pxelinux cfg path"
-msgstr "UmÃstÄ›nÃ souborÅ¯ s nastavenÃmi pro PXELINUX"
+msgstr "cesta k souborÅ¯m s nastavenÃmi pro PXELINUX"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:68
 msgid "Path where argonaut-fuse should store pxelinux.cfg"
@@ -646,7 +657,7 @@ msgstr "Argonaut server"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:49
 msgid "Delete finished tasks"
-msgstr "Smazat jiÅ¾ dokonÄenÃ© Ãºlohy"
+msgstr "smazat jiÅ¾ dokonÄenÃ© Ãºlohy"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
@@ -662,11 +673,13 @@ 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 "Zda mÃ¡ argonaut server na zaÄÃ¡tku zÃskat informace z repozitÃ¡Å™Å¯ a pak jednou dennÄ› obnovovat. Je tÅ™eba pro vytvÃ¡Å™enÃ seznamu FAI balÃÄkÅ¯."
+msgstr ""
+"Zda mÃ¡ argonaut server na zaÄÃ¡tku zÃskat informace z repozitÃ¡Å™Å¯ a pak jednou"
+" dennÄ› obnovovat. Je tÅ™eba pro vytvÃ¡Å™enÃ seznamu FAI balÃÄkÅ¯."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:67
 msgid "Port on which the argonaut server will be listening"
@@ -674,12 +687,14 @@ msgstr "Port, na kterÃ©m bude argonaut server oÄekÃ¡vat spojenÃ"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:72
 msgid "Timeout"
-msgstr "ÄŒasovÃ½ limit"
+msgstr "ÄasovÃ½ limit"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "Doba (v sekundÃ¡ch) po jejÃmÅ¾ uplynutÃ bude argonaut klient Äi server povaÅ¾ovÃ¡n za nedostupnÃ½"
+msgstr ""
+"Doba (v sekundÃ¡ch) po jejÃmÅ¾ uplynutÃ bude argonaut klient Äi server "
+"povaÅ¾ovÃ¡n za nedostupnÃ½"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -695,11 +710,12 @@ msgstr "RozhranÃ"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:91
 msgid "Interface to use for sending WakeOnLan requests"
-msgstr "SÃÅ¥ovÃ© rozhranÃ pÅ™es kterÃ© posÃlat poÅ¾adavky na probuzenÃ poÄÃtaÄÅ¯ (WoL)"
+msgstr ""
+"SÃÅ¥ovÃ© rozhranÃ pÅ™es kterÃ© posÃlat poÅ¾adavky na probuzenÃ poÄÃtaÄÅ¯ (WoL)"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:96
 msgid "IP tool"
-msgstr "nÃ¡stroj pro IP"
+msgstr "IP nÃ¡stroj"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:96
 msgid "IP tool to use"
@@ -728,7 +744,7 @@ msgstr "NastavenÃ zrcadla Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:41
 msgid "Argonaut mirror settings"
-msgstr "NastavenÃ zrcadla Argonautu"
+msgstr "nastavenÃ zrcadla Argonautu"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:44
 msgid "Local Debian mirror directory"
@@ -740,7 +756,7 @@ msgstr "NastavenÃ pro Argonaut Debconf Crawler"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:55
 msgid "Local packages folder"
-msgstr "SloÅ¾ka s mÃstnÃmi balÃÄky"
+msgstr "mÃstnÃ sloÅ¾ka s balÃÄky"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
 msgid "Folder in which the crawler will store packages during analysis"
@@ -748,15 +764,16 @@ msgstr "SloÅ¾ka, ve kterÃ© clrawler bude uklÃ¡dat balÃÄky v prÅ¯bÄ›hu analÃ½zy
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
 msgid "Argonaut Repository configuration"
-msgstr "NastavenÃ repozitÃ¡Å™e Argonaut"
+msgstr "NastavenÃ repozitÃ¡Å™e pro Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:66
 msgid "Proxy"
-msgstr "Proxy"
+msgstr "proxy"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
 msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "UrÄuje http proxy (jako napÅ™. Squid), kterou pouÅ¾Ãt pro metodu http a ftp"
+msgstr ""
+"UrÄuje http proxy (jako napÅ™. Squid), kterou pouÅ¾Ãt pro metodu http a ftp"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
 msgid "Directory in which logs should be stored"
@@ -770,11 +787,14 @@ msgstr "NevÅ¡Ãmat si chyb"
 msgid ""
 "Causes debmirror to ignore missing or broken deb and source files but still "
 "be pedantic about checking meta files"
-msgstr "ZpÅ¯sobÃ, Å¾e si debmirror nebude vÅ¡Ãmat chybÄ›jÃcÃch Äi poÅ¡kozenÃ½ch .deb a souborÅ¯ se zdrojovÃ½mi kÃ³dy. Ale stÃ¡le bude velmi dÅ¯slednÃ½ ohlednÄ› kontrolovÃ¡nÃ meta souborÅ¯"
+msgstr ""
+"ZpÅ¯sobÃ, Å¾e si debmirror nebude vÅ¡Ãmat chybÄ›jÃcÃch Äi poÅ¡kozenÃ½ch .deb a "
+"souborÅ¯ se zdrojovÃ½mi kÃ³dy. Ale stÃ¡le bude velmi dÅ¯slednÃ½ ohlednÄ› "
+"kontrolovÃ¡nÃ meta souborÅ¯"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
 msgid "Source"
-msgstr "Zdroj"
+msgstr "zdroj"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
 msgid "Include source in the mirror"
@@ -782,7 +802,7 @@ msgstr "Zahrnout v zrcadlu zdrojovÃ© kÃ³dy"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
 msgid "GPG Check"
-msgstr "Kontrola GPG"
+msgstr "kontrola GPG"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:87
 msgid "Fail if the Release.gpg file is missing"
@@ -790,17 +810,19 @@ msgstr "V pÅ™ÃpadÄ›, Å¾e chybÃ soubor Release.gpg vyhlÃ¡sit neÃºspÄ›ch"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:92
 msgid "Contents"
-msgstr "Obsah"
+msgstr "obsah(uje)"
 
 #: 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 "DÃ¡le stÃ¡hnout soubory Contents.<arch>.gz (Poznamenejme, Å¾e tyto soubory mohou bÃ½t pomÄ›rnÄ› velikÃ© a Äasto se mÄ›nÃ)"
+msgstr ""
+"DÃ¡le stÃ¡hnout soubory Contents.<arch>.gz (Poznamenejme, Å¾e tyto soubory "
+"mohou bÃ½t pomÄ›rnÄ› velikÃ© a Äasto se mÄ›nÃ)"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Verbose"
-msgstr "Poskytovat podrobnÄ›jÅ¡Ã informace"
+msgstr "poskytovat podrobnÄ›jÅ¡Ã informace"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Wether to activate verbose mode"
@@ -810,7 +832,9 @@ msgstr "Zda zapnout vÃ½Å™eÄnÄ›jÅ¡Ã reÅ¾im"
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "Do fronty Ãºloh FusionDirectory mÅ¯Å¾ete importovat seznamy Ãºloh. MÄ›lo by se jednat o stÅ™ednÃky oddÄ›lenÃ½ seznam poloÅ¾ek v nÃ¡sledujÃcÃm formÃ¡tu:"
+msgstr ""
+"Do fronty Ãºloh FusionDirectory mÅ¯Å¾ete importovat seznamy Ãºloh. MÄ›lo by se "
+"jednat o stÅ™ednÃky oddÄ›lenÃ½ seznam poloÅ¾ek v nÃ¡sledujÃcÃm formÃ¡tu:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
@@ -834,8 +858,8 @@ msgstr ""
 
 #: addons/argonaut/import_events.tpl.c:20
 msgid "Timestamp"
-msgstr "ÄŒasovÃ© razÃtko"
+msgstr "ÄasovÃ¡ znaÄka"
 
 #: addons/argonaut/import_events.tpl.c:29
 msgid "Object group"
-msgstr "Skupina objektu"
+msgstr "skupina objektu"
diff --git a/argonaut/locale/de/fusiondirectory.po b/argonaut/locale/de/fusiondirectory.po
index 41d2a3019d168a07f08248c881eeb666f2b20b94..ac0c155f2773e707e61ce8acb15c5dca0b4478ef 100644
--- a/argonaut/locale/de/fusiondirectory.po
+++ b/argonaut/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr "Mehrere argonaut Server gefunden. Nur einer wird unterstÃ¼tzt"
 msgid "There is no argonaut server configured"
 msgstr "Es ist kein argonaut-Server konfiguriert"
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "\"%s\" konnte nicht gelesen werden!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" ist keine Datei!"
@@ -57,74 +58,76 @@ msgstr "Entfernen"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Die folgenden AuftrÃ¤ge konnten nicht gelÃ¶scht werden, sie mÃ¼ssen abgebrochen werden: %s"
+msgstr ""
+"Die folgenden AuftrÃ¤ge konnten nicht gelÃ¶scht werden, sie mÃ¼ssen abgebrochen"
+" werden: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Fehlerdetail"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Kann WarteschlangeneintrÃ¤ge nicht aktualisieren."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "sofort"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Wartend"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Fehler anzeigen"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "DurchgefÃ¼hrt"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "in Bearbeitung"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "Softwareupdate"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(Re)Installieren"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +210,7 @@ msgid "List of queued jobs"
 msgstr "Liste der geplanten VorgÃ¤nge"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Ereignis"
@@ -229,10 +232,10 @@ msgid "Actions"
 msgstr "Aktionen"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importieren"
 
@@ -281,24 +284,24 @@ msgstr "Datei importieren"
 msgid "Imported tasks"
 msgstr "Importierte Aufgaben"
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr "Infrastrukturdienst"
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Import abgeschlossen: %s VorgÃ¤nge importiert, %s fehlgeschlagen"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "Die Datei ist leer"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -352,7 +355,9 @@ msgstr "TaskId Datei"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Datei, die argonaut verwenden wird um seine Task ID wÃ¤hrend des Bootens zu speichern"
+msgstr ""
+"Datei, die argonaut verwenden wird um seine Task ID wÃ¤hrend des Bootens zu "
+"speichern"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
@@ -528,68 +533,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Benachrichtigung erlauben"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Aktualisierung erlauben (Semikolon getrennt und beendet)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Transfer erlauben  (Semikolon getrennt und beendet)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -651,7 +656,8 @@ msgstr "Beendete Aufgaben lÃ¶schen"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Ob der argonaut-Server erfolgreich abgeschlossene Aufgaben lÃ¶schen soll"
+msgstr ""
+"Ob der argonaut-Server erfolgreich abgeschlossene Aufgaben lÃ¶schen soll"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
 msgid "Get packages information"
@@ -679,7 +685,9 @@ msgstr "Wartezeit"
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "Zeit in Sekunden bevor ein argonaut-Client oder Server als down bezeichnet werden soll"
+msgstr ""
+"Zeit in Sekunden bevor ein argonaut-Client oder Server als down bezeichnet "
+"werden soll"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -810,7 +818,10 @@ msgstr "Ob der verbose-Modus aktiviert werden soll"
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "Sie kÃ¶nnen eine Liste von Jobs, der FusionDirectory Jobschlange hinzufÃ¼gen. Dies sollte durch Semikolon getrennte Liste von Items in folgenden Format sein:"
+msgstr ""
+"Sie kÃ¶nnen eine Liste von Jobs, der FusionDirectory Jobschlange hinzufÃ¼gen. "
+"Dies sollte durch Semikolon getrennte Liste von Items in folgenden Format "
+"sein:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
diff --git a/argonaut/locale/el_GR/fusiondirectory.po b/argonaut/locale/el_GR/fusiondirectory.po
index 80cca64b432ef468a762ee376c4c9f105e13c296..0e5577ce2714b0e8e7b682d290575162ec2b7690 100644
--- a/argonaut/locale/el_GR/fusiondirectory.po
+++ b/argonaut/locale/el_GR/fusiondirectory.po
@@ -1,20 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Elissavet Botsaki <elisavet_b@hotmail.com>, 2015
-# geotheod <geotheod77@gmail.com>, 2015
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Maria Nomikou <mnomikou@sch.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î±Î½Î¬Î³Î½Ï‰ÏƒÎ· Ï„Î¿Ï… \"%s\"!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "Î¤Î¿ \"%s\" Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±ÏÏ‡ÎµÎ¯Î¿!"
@@ -61,74 +58,75 @@ msgstr "Î‘Ï†Î±Î¯ÏÎµÏƒÎ·"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "ÎŸÎ¹ Î±ÎºÏŒÎ»Î¿Ï…Î¸ÎµÏ‚ ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Î´ÎµÎ½ Î³Î¯Î½ÎµÏ„Î±Î¹ Î½Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½, Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î¼Î±Ï„Î±Î¹Ï‰Î¸Î¿ÏÎ½: %s"
+msgstr ""
+"ÎŸÎ¹ Î±ÎºÏŒÎ»Î¿Ï…Î¸ÎµÏ‚ ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Î´ÎµÎ½ Î³Î¯Î½ÎµÏ„Î±Î¹ Î½Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½, Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î¼Î±Ï„Î±Î¹Ï‰Î¸Î¿ÏÎ½: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Î›ÎµÏ€Ï„Î¿Î¼ÎÏÎµÎ¹Î± Î»Î¬Î¸Î¿Ï…Ï‚"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "Î±Î¼ÎÏƒÏ‰Ï‚"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Î‘Î½Î±Î¼Î¿Î½Î®"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÏƒÏ†Î¬Î»Î¼Î±Ï„Î¿Ï‚"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¼ÎÎ½Î¿"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Î•Ï€Î±Î½ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(Î•Ï€Î±Î½)ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -211,7 +209,7 @@ msgid "List of queued jobs"
 msgstr "Î›Î¯ÏƒÏ„Î± ÎµÏÎ³Î±ÏƒÎ¹ÏŽÎ½ ÏƒÏ„Î·Î½ Î¿Ï…ÏÎ¬"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -233,10 +231,10 @@ msgid "Actions"
 msgstr "Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î®"
 
@@ -285,24 +283,25 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
-msgstr "Î†Î³Î½Ï‰Ï„Î· Ï…Ï€Î¿Î´Î¿Î¼Î®"
+msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± Ï…Ï€Î¿Î´Î¿Î¼Î®Ï‚"
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "Î— ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Î¿Î»Î¿ÎºÎ»Î·ÏÏŽÎ¸Î·ÎºÎµ:  %s ÏƒÏ…Î¼Î²Î¬Î½Ï„Î± ÏƒÏ„Î¬Î»Î¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±, %s Î±Ï€ÎÏ„Ï…Ï‡Î±Î½"
+msgstr ""
+"Î— ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Î¿Î»Î¿ÎºÎ»Î·ÏÏŽÎ¸Î·ÎºÎµ:  %s ÏƒÏ…Î¼Î²Î¬Î½Ï„Î± ÏƒÏ„Î¬Î»Î¸Î·ÎºÎ±Î½ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±, %s Î±Ï€ÎÏ„Ï…Ï‡Î±Î½"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -356,7 +355,9 @@ msgstr "Î‘ÏÏ‡ÎµÎ¯Î¿ Ï„Î±Ï…Ï„ÏŒÏ„Î·Ï„Î±Ï‚ Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Î‘ÏÏ‡ÎµÎ¯Î¿ ÏƒÏ„Î¿ Î¿Ï€Î¿Î¯Î¿ Ï„Î¿ argonaut Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÏƒÎµÎ¹ Ï„Î·Ï‚ Ï„Î±Ï…Ï„ÏŒÏ„Î·Ï„Î± Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·"
+msgstr ""
+"Î‘ÏÏ‡ÎµÎ¯Î¿ ÏƒÏ„Î¿ Î¿Ï€Î¿Î¯Î¿ Ï„Î¿ argonaut Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÏƒÎµÎ¹ Ï„Î·Ï‚ Ï„Î±Ï…Ï„ÏŒÏ„Î·Ï„Î± Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… "
+"ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
@@ -367,7 +368,9 @@ msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÏŽÎ½"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 msgid "Directory in which argonaut client should write its logs"
-msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¿ Ï€ÎµÎ»Î¬Ï„Î·Ï‚ argonaut Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎµÎ¹ Ï„Î¹Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚ Ï„Î¿Ï…"
+msgstr ""
+"ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¿ Ï€ÎµÎ»Î¬Ï„Î·Ï‚ argonaut Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎµÎ¹ Ï„Î¹Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚ "
+"Ï„Î¿Ï…"
 
 #: admin/systems/argonaut/class_argonautClient.inc:161
 #: admin/systems/services/argonaut/class_argonautServer.inc:103
@@ -491,7 +494,8 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:54
 msgid "The directory in which zone files must be created"
-msgstr "ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸Î¿ÏÎ½ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î¶ÏŽÎ½Î·Ï‚ (zone files)"
+msgstr ""
+"ÎŸ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸Î¿ÏÎ½ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î¶ÏŽÎ½Î·Ï‚ (zone files)"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:59
 msgid "TTL"
@@ -532,68 +536,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -628,7 +632,8 @@ msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î±"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:56
 msgid "Directory in which argonaut-fuse will store its log"
-msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Ï„Î¿ argonaut-fuse Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎµÎ¹ Ï„Î¹Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚ Ï„Î¿Ï…"
+msgstr ""
+"ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Ï„Î¿ argonaut-fuse Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎµÎ¹ Ï„Î¹Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÎÏ‚ Ï„Î¿Ï…"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
 msgid "TFTP"
@@ -655,7 +660,9 @@ msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î® Î¿Î»Î¿ÎºÎ»Î·ÏÏ‰Î¼ÎÎ½Ï‰Î½ Î´Î¹ÎµÏÎ³Î±ÏƒÎ¹ÏŽÎ½"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Î‘Î½ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ argonaut Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¹Î±Î³ÏÎ¬Ï†ÎµÎ¹ Ï„Î·Ï‚ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚ Î¿Î»Î¿ÎºÎ»Î·ÏÏ‰Î¼ÎÎ½ÎµÏ‚ Î´Î¹ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Î® ÏŒÏ‡Î¹"
+msgstr ""
+"Î‘Î½ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ argonaut Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î¹Î±Î³ÏÎ¬Ï†ÎµÎ¹ Ï„Î·Ï‚ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚ Î¿Î»Î¿ÎºÎ»Î·ÏÏ‰Î¼ÎÎ½ÎµÏ‚ "
+"Î´Î¹ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚ Î® ÏŒÏ‡Î¹"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:55
 msgid "Get packages information"
@@ -666,7 +673,10 @@ 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 "Î‘Î½ o argonaut Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î® ÏŒÏ‡Î¹ Î½Î± Ï€Î¬ÏÎµÎ¹ Ï„Î¹Ï‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ Î±Ï€ÏŒ Ï„Î± Î±Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î± ÏƒÏ„Î·Î½ Î±ÏÏ‡Î® ÎºÎ±Î¹ Î¼ÎµÏ„Î¬ Î¼Î¯Î± Ï†Î¿ÏÎ¬ Ï„Î·Î½ Î·Î¼ÎÏÎ±. Î§ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î³Î¹Î± Ï„Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î»Î¯ÏƒÏ„Î±Ï‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ FAI."
+msgstr ""
+"Î‘Î½ o argonaut Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î® ÏŒÏ‡Î¹ Î½Î± Ï€Î¬ÏÎµÎ¹ Ï„Î¹Ï‚ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ "
+"Î±Ï€ÏŒ Ï„Î± Î±Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î± ÏƒÏ„Î·Î½ Î±ÏÏ‡Î® ÎºÎ±Î¹ Î¼ÎµÏ„Î¬ Î¼Î¯Î± Ï†Î¿ÏÎ¬ Ï„Î·Î½ Î·Î¼ÎÏÎ±. Î§ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î³Î¹Î± Ï„Î· "
+"Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î»Î¯ÏƒÏ„Î±Ï‚ Ï„Ï‰Î½ Ï€Î±ÎºÎÏ„Ï‰Î½ FAI."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
@@ -683,7 +693,9 @@ msgstr "Î›Î®Î¾Î· Ï‡ÏÏŒÎ½Î¿Ï…:"
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "ÎŸ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½ Î¸ÎµÏ‰ÏÎ®ÏƒÎ¿Ï…Î¼Îµ ÏŒÏ„Î¹ Î¿ argonaut Ï€ÎµÎ»Î¬Ï„Î·Ï‚ Î® Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÎÏ‡ÎµÎ¹ Ï€ÎÏƒÎµÎ¹ (Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯)"
+msgstr ""
+"ÎŸ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½ Î¸ÎµÏ‰ÏÎ®ÏƒÎ¿Ï…Î¼Îµ ÏŒÏ„Î¹ Î¿ argonaut Ï€ÎµÎ»Î¬Ï„Î·Ï‚ Î® "
+"Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ ÎÏ‡ÎµÎ¹ Ï€ÎÏƒÎµÎ¹ (Î´ÎµÎ½ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³ÎµÎ¯)"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -748,7 +760,9 @@ msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚ Ï„Î¿Ï€Î¹ÎºÏŽÎ½ Ï€Î±ÎºÎÏ„Ï‰Î½"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:56
 msgid "Folder in which the crawler will store packages during analysis"
-msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¿ crawler Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÏƒÎµÎ¹ Ï„Î± Ï€Î±ÎºÎÏ„Î± ÎºÎ±Ï„Î± Ï„Î· Î´Î¹Î¬ÏÎºÎµÎ¹Î± Ï„Î·Ï‚ Î±Î½Î¬Î»Ï…ÏƒÎ·Ï‚"
+msgstr ""
+"Î¦Î¬ÎºÎµÎ»Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¿ crawler Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÏƒÎµÎ¹ Ï„Î± Ï€Î±ÎºÎÏ„Î± ÎºÎ±Ï„Î± Ï„Î· Î´Î¹Î¬ÏÎºÎµÎ¹Î± Ï„Î·Ï‚ "
+"Î±Î½Î¬Î»Ï…ÏƒÎ·Ï‚"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:63
 msgid "Argonaut Repository configuration"
@@ -760,7 +774,9 @@ msgstr "Î”Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®Ï‚"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:67
 msgid "Specifies the http proxy (like Squid) to use for http and hftp method"
-msgstr "ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï„Î¿Î½ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® Ï„Î¿Ï… http (Ï€.Ï‡. Squid) Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± Ï„Î¿ http ÎºÎ±Î¹ Ï„Î¿ hfrp Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿"
+msgstr ""
+"ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï„Î¿Î½ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® Ï„Î¿Ï… http (Ï€.Ï‡. Squid) Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± "
+"Ï„Î¿ http ÎºÎ±Î¹ Ï„Î¿ hfrp Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:71
 msgid "Directory in which logs should be stored"
@@ -800,7 +816,9 @@ msgstr "Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î±"
 msgid ""
 "Additionally download Contents.<arch>.gz files (Note that these files can be"
 " relatively big and can change frequently)"
-msgstr "Î ÏÏŒÏƒÎ¸ÎµÏ„Î± ÎºÎ±Ï„ÎµÎ²Î±ÏƒÎ¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…. <arch>.gz (Î ÏÎ¿ÏƒÎÎ¾Ï„Îµ ÏŒÏ„Î¹ Î±Ï…Ï„Î¬ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼ÎµÎ³Î¬Î»Î± ÎºÎ±Î¹ Î½Î± Î±Î»Î»Î¬Î¶Î¿Ï…Î½ ÏƒÏ…Ï‡Î½Î¬)"
+msgstr ""
+"Î ÏÏŒÏƒÎ¸ÎµÏ„Î± ÎºÎ±Ï„ÎµÎ²Î±ÏƒÎ¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…. <arch>.gz (Î ÏÎ¿ÏƒÎÎ¾Ï„Îµ ÏŒÏ„Î¹ Î±Ï…Ï„Î¬ Ï„Î± "
+"Î±ÏÏ‡ÎµÎ¯Î± Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼ÎµÎ³Î¬Î»Î± ÎºÎ±Î¹ Î½Î± Î±Î»Î»Î¬Î¶Î¿Ï…Î½ ÏƒÏ…Ï‡Î½Î¬)"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Verbose"
diff --git a/argonaut/locale/en/fusiondirectory.po b/argonaut/locale/en/fusiondirectory.po
index 051b069758af3e39f4d64ddeeb451e894a478a3a..302a353a6712984534b3ab3a28a5cc7c6d189d02 100644
--- a/argonaut/locale/en/fusiondirectory.po
+++ b/argonaut/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +59,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +229,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +281,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +528,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es/fusiondirectory.po b/argonaut/locale/es/fusiondirectory.po
index 69c8dbe8ef51d6d910a8e1c983c591f5dc857735..f1463508c7381c840eaa5525b5592fc389a188b9 100644
--- a/argonaut/locale/es/fusiondirectory.po
+++ b/argonaut/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -57,74 +58,75 @@ msgstr "Eliminar"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
+msgstr ""
+"Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Error"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "No se puede actualizar las entradas de la cola."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "inmediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Procesado"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "en progreso"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Apagar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Despertar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "ActualizaciÃ³n software"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +209,7 @@ msgid "List of queued jobs"
 msgstr "Lista de trabajos en cola"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Evento"
@@ -229,10 +231,10 @@ msgid "Actions"
 msgstr "Acciones"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importar"
 
@@ -281,24 +283,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "ImportaciÃ³n completa: %s eventos han sido enviados, %s han fallado"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "el archivo estÃ¡ vacÃo"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -528,68 +530,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Permitir notificaciÃ³n"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir actualizaciÃ³n (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir transferencia (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es_CO/fusiondirectory.po b/argonaut/locale/es_CO/fusiondirectory.po
index a94604f527d139e921ec402714f7cf87708d6871..3e9e6a3add401c34a14e40f79c46ff3a8688eed4 100644
--- a/argonaut/locale/es_CO/fusiondirectory.po
+++ b/argonaut/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Borrar"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Error"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "Acciones"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "el archivo estÃ¡ vacio"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/es_VE/fusiondirectory.po b/argonaut/locale/es_VE/fusiondirectory.po
index ca712e0bc31ab7d7b9f0787f7ce30521c5a55c2c..cefb09c4698bd0c02a407f4c50e8c0e946279856 100644
--- a/argonaut/locale/es_VE/fusiondirectory.po
+++ b/argonaut/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr "Varios servidores Argonaut encontrados. Solo se soporta uno"
 msgid "There is no argonaut server configured"
 msgstr "No hay un servidor Argonaut configurado"
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -57,74 +58,75 @@ msgstr "Eliminar"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
+msgstr ""
+"Las siguientes tareas no pueden ser eliminadas, han sido canceladas: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "InformaciÃ³n"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Detalles del error"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Error"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "No se puede actualizar las entradas de la cola."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "inmediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Mostrar error"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Procesado"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "en progreso"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Apagar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Despertar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "ActualizaciÃ³n software"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +209,7 @@ msgid "List of queued jobs"
 msgstr "Lista de trabajos en cola"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Evento"
@@ -229,10 +231,10 @@ msgid "Actions"
 msgstr "Acciones"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importar"
 
@@ -281,24 +283,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "ImportaciÃ³n completa: %s eventos han sido enviados, %s han fallado"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "el archivo estÃ¡ vacÃo"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -528,68 +530,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Permitir notificaciÃ³n"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir actualizaciÃ³n (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir transferencia (separado y terminado con punto y coma)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -810,7 +812,10 @@ msgstr ""
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "Puede importar una lista de trabajos a la cola de trabajos de FusionDirectory. Esta debe ser una lista separada por punto y coma de entradas en el siguiente formato:"
+msgstr ""
+"Puede importar una lista de trabajos a la cola de trabajos de "
+"FusionDirectory. Esta debe ser una lista separada por punto y coma de "
+"entradas en el siguiente formato:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
diff --git a/argonaut/locale/fa_IR/fusiondirectory.po b/argonaut/locale/fa_IR/fusiondirectory.po
index 5ab6e99ca8523919a97334a4d487eeae098f23f6..07d82ddd26e6c299f11cbf8a85e49bb5cd10d1cf 100644
--- a/argonaut/locale/fa_IR/fusiondirectory.po
+++ b/argonaut/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/fi_FI/fusiondirectory.po b/argonaut/locale/fi_FI/fusiondirectory.po
index f7cb171eac05208e7539e6f664fad1b12117c606..04a1ec2eb3f767604cbb20adb5756089ffaafbb3 100644
--- a/argonaut/locale/fi_FI/fusiondirectory.po
+++ b/argonaut/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Poista"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Virhe"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Tapahtuma"
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "Toiminnot"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/fr/fusiondirectory.po b/argonaut/locale/fr/fusiondirectory.po
index 27bed8511b71a1afdd7e817ec2afebeca5046978..38fcdf5c5a2fbc54345edaed3b509a47b955db32 100644
--- a/argonaut/locale/fr/fusiondirectory.po
+++ b/argonaut/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016-2017
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:25+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,18 +20,20 @@ msgstr ""
 
 #: include/class_supportDaemon.inc:107
 msgid "Multiple argonaut server found. Only one is supported"
-msgstr "Plusieurs serveurs Argonaut ont Ã©tÃ© trouvÃ©s. Un seul est supportÃ© pour l'instant"
+msgstr ""
+"Plusieurs serveurs Argonaut ont Ã©tÃ© trouvÃ©s. Un seul est supportÃ© pour "
+"l'instant"
 
 #: include/class_supportDaemon.inc:109
 msgid "There is no argonaut server configured"
 msgstr "Il n'y a pas de serveur Argonaut configurÃ©"
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossible de lire \"%s\"â€¯!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" n'est pas un fichierâ€¯!"
@@ -49,7 +50,7 @@ msgstr "Procure un mÃ©canisme pour activer des systÃ¨mes automatiquement"
 
 #: addons/argonaut/class_argonautQueue.inc:93
 msgid "Permission"
-msgstr "Permission"
+msgstr "Permissions"
 
 #: addons/argonaut/class_argonautQueue.inc:123
 #: addons/argonaut/deploy-list.xml:86 addons/argonaut/deploy-list.xml:136
@@ -59,74 +60,76 @@ msgstr "Supprimer"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les tÃ¢ches suivantes ne peuvent pas Ãªtre effacÃ©es, elles doivent Ãªtre annulÃ©esâ€¯: %s"
+msgstr ""
+"Les tÃ¢ches suivantes ne peuvent pas Ãªtre effacÃ©es, elles doivent Ãªtre "
+"annulÃ©esâ€¯: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "DÃ©tail de l'erreur"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Impossible de mettre Ã  jour les entrÃ©es de la file d'attente."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "immÃ©diatement"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "En attente"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Afficher les erreurs"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "TerminÃ©"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "en cours"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Ã‰teindre"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "RedÃ©marrer"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "RÃ©veiller"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "Mise Ã  jour logicielle"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(RÃ©)installer"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr "RafraÃ®chir les fichiers esclaves (ldap2zone)"
 
@@ -209,7 +212,7 @@ msgid "List of queued jobs"
 msgstr "Liste des tÃ¢ches dans la queue"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Ã‰vÃ¨nement"
@@ -220,7 +223,7 @@ msgstr "Cible"
 
 #: addons/argonaut/deploy-list.xml:35
 msgid "Task"
-msgstr "TÃ¢che"
+msgstr "TÃ¢ches"
 
 #: addons/argonaut/deploy-list.xml:59
 msgid "Status"
@@ -231,10 +234,10 @@ msgid "Actions"
 msgstr "Actions"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importer"
 
@@ -273,7 +276,7 @@ msgstr "Importer une liste de taches dans argonaut"
 
 #: addons/argonaut/class_argonautImportFile.inc:63
 msgid "Upload"
-msgstr "TÃ©lÃ©verser"
+msgstr "TÃ©lÃ©charger"
 
 #: addons/argonaut/class_argonautImportFile.inc:67
 msgid "Import file"
@@ -283,24 +286,25 @@ msgstr "Importer un fichier"
 msgid "Imported tasks"
 msgstr "Taches importÃ©es "
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr "Fixer les erreurs dans votre CSV"
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr "Service dâ€™infrastructure"
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finieâ€¯: %s Ã©vÃ¨nements ont Ã©tÃ© envoyÃ©s, %s ont Ã©chouÃ©s"
+msgstr ""
+"L'importation est finieâ€¯: %s Ã©vÃ¨nements ont Ã©tÃ© envoyÃ©s, %s ont Ã©chouÃ©s"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
-msgstr "le fichier est vide"
+msgstr "le fichier est vide."
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -397,7 +401,9 @@ msgstr "Certificat CA"
 
 #: admin/systems/argonaut/class_argonautClient.inc:174
 msgid "Path to the CA certificate file on Argonaut client"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le client Argonaut"
+msgstr ""
+"Chemin du fichier contenant le certificat du CA public sur le client "
+"Argonaut"
 
 #: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
@@ -427,7 +433,7 @@ msgstr "ParamÃ¨tres de Argonaut Fuse pour le module OPSI"
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
 #: admin/systems/services/argonaut/class_argonautServer.inc:32
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
@@ -515,7 +521,9 @@ msgstr "Base de recherche"
 msgid ""
 "LDAP base in which ldap2zone should search. Only usefull if you got several "
 "nodes for the same zone."
-msgstr "Base LDAP dans laquelle ldap2zone  doit effectuer la recherche. Seulement utile si vous avez plusieurs nÅ“uds pour la mÃªme zone."
+msgstr ""
+"Base LDAP dans laquelle ldap2zone  doit effectuer la recherche. Seulement "
+"utile si vous avez plusieurs nÅ“uds pour la mÃªme zone."
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:81
 msgid "Ldap2zone master settings"
@@ -530,68 +538,72 @@ msgid "Do not write reverse zone"
 msgstr "Ne pas Ã©crire la zone inverse"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "IPs autorisÃ©es Ã  notifier (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgid "Notify"
+msgstr "Notifier"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr "Permet les updates"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
-msgstr "IPs autorisÃ©es Ã  mettre Ã  jour (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgstr ""
+"IPs autorisÃ©es Ã  mettre Ã  jour (sÃ©parÃ©es et terminÃ© par un point-virgule)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr "Permet le transfert"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
-msgstr "IPs autorisÃ©es Ã  transfÃ©rer (sÃ©parÃ©es et terminÃ© par un point-virgule)"
+msgstr ""
+"IPs autorisÃ©es Ã  transfÃ©rer (sÃ©parÃ©es et terminÃ© par un point-virgule)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr "VÃ©rifier les noms"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
-msgstr "Force la vÃ©rification avec les RFC 952 et RFC 1123 de tout nom d'hÃ´te pour la zone, le niveau de vÃ©rification est en fonction du paramÃ¨tre choisi"
+msgstr ""
+"Force la vÃ©rification avec les RFC 952 et RFC 1123 de tout nom d'hÃ´te pour "
+"la zone, le niveau de vÃ©rification est en fonction du paramÃ¨tre choisi"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr "ParamÃ¨tres DNS esclaves Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr "Gerer les DNS slaves"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr "zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
-msgstr "Zone(s) DNS esclaves qui seront stockÃ©es sur ce serveur"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
+msgstr "Zone(s) DNS qui doivent Ãªtre stockÃ©es comme esclave sur ce serveur"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr "MaÃ®tre"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
-msgstr ""
+msgstr "IP principale (s) pour cette zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr "Zones inverses"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr "Ce serveur doit aussi Ãªtre esclave des zones inverses"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr "DNS slaves"
 
@@ -653,7 +665,9 @@ msgstr "Supprimer les tÃ¢ches terminÃ©es"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Activer ou non la suppression des tÃ¢ches terminÃ©es avec succÃ¨s par le serveur Argonaut"
+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 information"
@@ -664,7 +678,10 @@ 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 "Si oui ou non le serveur Argonaut devrait obtenir les informations des paquets Ã  partir des dÃ©pÃ´ts au lancement, puis une fois par jour. NÃ©cessaire pour la crÃ©ation de listes de paquets FAI."
+msgstr ""
+"Si oui ou non le serveur Argonaut devrait obtenir les informations des "
+"paquets Ã  partir des dÃ©pÃ´ts au lancement, puis une fois par jour. NÃ©cessaire"
+" pour la crÃ©ation de listes de paquets FAI."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
@@ -681,7 +698,9 @@ msgstr "Temps d'attente maximum"
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "DÃ©lai en secondes avant de considÃ©rer le systÃ¨me argonaut (client ou serveur) comme Ã©teint"
+msgstr ""
+"DÃ©lai en secondes avant de considÃ©rer le systÃ¨me argonaut (client ou "
+"serveur) comme Ã©teint"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -717,7 +736,9 @@ msgstr "Chemin du fichier contenant le certificat sur le serveur Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
 msgid "Path to the CA certificate file on Argonaut server"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur Argonaut"
+msgstr ""
+"Chemin du fichier contenant le certificat du CA public sur le serveur "
+"Argonaut"
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
 msgid "The CN in the server certificate"
@@ -772,7 +793,9 @@ msgstr "Ignorer les erreurs"
 msgid ""
 "Causes debmirror to ignore missing or broken deb and source files but still "
 "be pedantic about checking meta files"
-msgstr "Demande Ã  debmirror dâ€™ignorer les fichiers deb et sources cassÃ©s ou manquant mais de continuer les vÃ©rifications des fichiers meta"
+msgstr ""
+"Demande Ã  debmirror dâ€™ignorer les fichiers deb et sources cassÃ©s ou manquant"
+" mais de continuer les vÃ©rifications des fichiers meta"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:82
 msgid "Source"
@@ -798,7 +821,9 @@ msgstr "Contenu"
 msgid ""
 "Additionally download Contents.<arch>.gz files (Note that these files can be"
 " relatively big and can change frequently)"
-msgstr "TÃ©lÃ©charge en plus les fichiers Contents.<arch>.gz (Notez que ces fichiers peuvent Ãªtre gros et changer frÃ©quemment)"
+msgstr ""
+"TÃ©lÃ©charge en plus les fichiers Contents.<arch>.gz (Notez que ces fichiers "
+"peuvent Ãªtre gros et changer frÃ©quemment)"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Verbose"
@@ -812,7 +837,10 @@ msgstr "Activer/DÃ©sactiver le mode verbeux"
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "Vous pouvez importer une liste de tÃ¢ches dans la queue de FusionDirectory. Cela doit Ãªtre une liste de tÃ¢ches sÃ©parÃ©es par des point-virgules dans le format suivantâ€¯:"
+msgstr ""
+"Vous pouvez importer une liste de tÃ¢ches dans la queue de FusionDirectory. "
+"Cela doit Ãªtre une liste de tÃ¢ches sÃ©parÃ©es par des point-virgules dans le "
+"format suivantâ€¯:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
@@ -820,7 +848,7 @@ msgstr "horodatage"
 
 #: addons/argonaut/import_events.tpl.c:8
 msgid "MAC-address"
-msgstr "adresse MAC"
+msgstr "Adresse MAC"
 
 #: addons/argonaut/import_events.tpl.c:11
 msgid "job type"
@@ -836,8 +864,8 @@ msgstr "Type de taches disponibles: %1"
 
 #: addons/argonaut/import_events.tpl.c:20
 msgid "Timestamp"
-msgstr "Horodatage"
+msgstr "Date"
 
 #: addons/argonaut/import_events.tpl.c:29
 msgid "Object group"
-msgstr "Groupe d'objet"
+msgstr "Groupes d'objets"
diff --git a/argonaut/locale/hu_HU/fusiondirectory.po b/argonaut/locale/hu_HU/fusiondirectory.po
index bd12cad1a273923dc89a92fa30fcec9bdb838768..6954e20ff0f0fcbe571b37151c79db684dc93773 100644
--- a/argonaut/locale/hu_HU/fusiondirectory.po
+++ b/argonaut/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +59,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +229,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +281,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +528,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/id/fusiondirectory.po b/argonaut/locale/id/fusiondirectory.po
index c5a020be6d3682f1d5c7e1e69ad60f283e8d346a..f41508a52847f165e405dca8dec25aa2ad11cf37 100644
--- a/argonaut/locale/id/fusiondirectory.po
+++ b/argonaut/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +59,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +229,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +281,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +528,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/it_IT/fusiondirectory.po b/argonaut/locale/it_IT/fusiondirectory.po
index 1610792d947c2890eccbf2279334cb9f25e42e4f..6ef1c10f115d4452b309bb68a3b882db65c70709 100644
--- a/argonaut/locale/it_IT/fusiondirectory.po
+++ b/argonaut/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016-2017
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,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:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr "Impossibile analizzare \"%s\"!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr "\"%s\" non Ã© un file!"
@@ -59,74 +58,76 @@ msgstr "Elimina"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "I lavori seguenti non possono essere cancellati, devono essere interrotti: %s"
+msgstr ""
+"I lavori seguenti non possono essere cancellati, devono essere interrotti: "
+"%s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Dettaglio dell'errore"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Errore"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Impossibile aggiornare la coda delle entry."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "immediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "In attesa"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Mostra l'errore"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Finito"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "in corso"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Spegni"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Risvegliare"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "Aggiornamento del software"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(Re)Installa"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr "Refresh di file slaves (ldap2zone)"
 
@@ -209,7 +210,7 @@ msgid "List of queued jobs"
 msgstr "Elenco dei lavori in coda"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Evento"
@@ -231,10 +232,10 @@ msgid "Actions"
 msgstr "Azioni"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importa"
 
@@ -283,24 +284,24 @@ msgstr "Importa file"
 msgid "Imported tasks"
 msgstr "AttivitÃ  importate"
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr "Prima di tutto fissa gli errori nel tuo file CSV"
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr "Servizio d'infrastruttura"
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Importazione completata: %s eventi inviati correttamente, %s falliti"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "il file Ã¨ vuoto"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -530,70 +531,74 @@ msgid "Do not write reverse zone"
 msgstr "Non scrivere, zona inversa"
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Attiva la notifica"
+msgid "Notify"
+msgstr "Notifica"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr "Consenti aggiornamento"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
-msgstr "Consenti l'aggiornamento (punto e virgola per la separazione e la chiusura)"
+msgstr ""
+"Consenti l'aggiornamento (punto e virgola per la separazione e la chiusura)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr "Consenti trasferimento"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
-msgstr "Consenti il trasferimento (punto e virgola per la separazione e la chiusura)"
+msgstr ""
+"Consenti il trasferimento (punto e virgola per la separazione e la chiusura)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr "Controllare i nomi"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
-msgstr "Causa qualsiasi nome host per la zona da controllare per la conformitÃ  con RFC 952 e RFC 1123 e prendere l'azione definita"
+msgstr ""
+"Causa qualsiasi nome host per la zona da controllare per la conformitÃ  con "
+"RFC 952 e RFC 1123 e prendere l'azione definita"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr "Impostazione dello slave Ldap2zone"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
-msgstr ""
+msgstr "Gestione di Slaves DNS"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr "Zona"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
-msgstr ""
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
+msgstr "zona DNS il cui server deve essere dichiarato come slave di"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr "Master"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr "Master IP(s) per questa zona"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr "rovesci"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr "Questo server dovrebbe essere slave anche di zone di rovesci"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
-msgstr ""
+msgstr "Slaves DNS"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:32
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:33
@@ -653,7 +658,9 @@ msgstr "Cancella le operazioni terminate"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "Se Ã© vero o meno che il server argonaut dovrebbe cancellare le tasks terminate con successo"
+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 information"
@@ -664,7 +671,10 @@ 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 "Sia che il server Argonaut ottenga informazioni dei pacchetti dai repository all'inizio e poi una volta al giorno o no. Necessario per la creazione della lista dei pacchetti FAI."
+msgstr ""
+"Sia che il server Argonaut ottenga informazioni dei pacchetti dai repository"
+" all'inizio e poi una volta al giorno o no. Necessario per la creazione "
+"della lista dei pacchetti FAI."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:66
 msgid "Port"
@@ -681,7 +691,9 @@ msgstr "Tempo di attesa massimo"
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "Tempo in secondi prima di prendere in considerazione un client o un server Argonaut come inattivo "
+msgstr ""
+"Tempo in secondi prima di prendere in considerazione un client o un server "
+"Argonaut come inattivo "
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -798,7 +810,9 @@ msgstr "Contenuti"
 msgid ""
 "Additionally download Contents.<arch>.gz files (Note that these files can be"
 " relatively big and can change frequently)"
-msgstr "Contenuti addizionali scaricati. File <arch>.gz (N.B.: questi files possono essere relativamente grossi e possono cambiare frequentemente)"
+msgstr ""
+"Contenuti addizionali scaricati. File <arch>.gz (N.B.: questi files possono "
+"essere relativamente grossi e possono cambiare frequentemente)"
 
 #: admin/systems/services/argonaut/class_argonautMirrorConfig.inc:98
 msgid "Verbose"
@@ -812,7 +826,10 @@ msgstr "Se attivare la modalitÃ  verbose"
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "Ãˆ possibile importare una lista di lavori nella coda di lavoro di FusionDirectory. Dovrebbe essere un elenco di elementi separati da punto e virgola nel seguente formato:"
+msgstr ""
+"Ãˆ possibile importare una lista di lavori nella coda di lavoro di "
+"FusionDirectory. Dovrebbe essere un elenco di elementi separati da punto e "
+"virgola nel seguente formato:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
diff --git a/argonaut/locale/lv/fusiondirectory.po b/argonaut/locale/lv/fusiondirectory.po
index 3909f8719bb18e1a5fec27fc4fde253231e785b5..8ef0d9243be3ddbf1b754a1557daf2ca7bdba9cc 100644
--- a/argonaut/locale/lv/fusiondirectory.po
+++ b/argonaut/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "NoÅ†emt"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "DarbÄ«bas"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/nb/fusiondirectory.po b/argonaut/locale/nb/fusiondirectory.po
index 277e277cd3898b54bbfad18ebd1969be5868b309..b6b84ca7e22fdaeeff841b657269166c474081c1 100644
--- a/argonaut/locale/nb/fusiondirectory.po
+++ b/argonaut/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Fjern"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Feil"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/nl/fusiondirectory.po b/argonaut/locale/nl/fusiondirectory.po
index 429b48bf483e9cd52b2ecb3dc704fcf88316e12d..42e33b23455558711fc8c5c8c67c84df2228064d 100644
--- a/argonaut/locale/nl/fusiondirectory.po
+++ b/argonaut/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +26,15 @@ 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:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
-msgstr ""
+msgstr "Kan \"%s\" niet lezen!"
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
-msgstr ""
+msgstr "\"%s\" is geen bestand!"
 
 #: addons/argonaut/class_argonautQueue.inc:41
 #: addons/argonaut/class_argonautQueue.inc:46
@@ -57,74 +58,76 @@ msgstr "Verwijderen"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "De volgende jobs kunnen niet worden verwijderd, ze moeten afgebroken worden: %s"
+msgstr ""
+"De volgende jobs kunnen niet worden verwijderd, ze moeten afgebroken worden:"
+" %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "Info"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Fout detail"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Fout"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "Kan queue waarde niet updaten."
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "onmiddellijk"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Wachten"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Toon fouten"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Verwerkte"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "in verwerking"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Uitschakelen"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "Software update"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
-msgstr ""
+msgstr "(Her)Installatie"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -140,7 +143,7 @@ msgstr "Minuten"
 
 #: addons/argonaut/class_argonautAction.inc:37
 msgid "Seconds"
-msgstr ""
+msgstr "Seconden"
 
 #: addons/argonaut/class_argonautAction.inc:53
 msgid "Date"
@@ -207,7 +210,7 @@ msgid "List of queued jobs"
 msgstr "Lijst van queued jobs"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Event"
@@ -229,10 +232,10 @@ msgid "Actions"
 msgstr "Acties"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importeren"
 
@@ -275,30 +278,30 @@ msgstr "Uploaden"
 
 #: addons/argonaut/class_argonautImportFile.inc:67
 msgid "Import file"
-msgstr ""
+msgstr "Importeer bestand"
 
 #: addons/argonaut/class_argonautImportFile.inc:72
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Importeren voltooid : %s events succesvol verzonde, %s mislukt"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "bestand is leeg"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -331,7 +334,7 @@ msgstr ""
 #: admin/systems/argonaut/class_argonautClient.inc:139
 #: admin/systems/services/argonaut/class_argonautServer.inc:61
 msgid "Protocol"
-msgstr ""
+msgstr "Protocol"
 
 #: admin/systems/argonaut/class_argonautClient.inc:139
 #: admin/systems/services/argonaut/class_argonautServer.inc:61
@@ -382,7 +385,7 @@ msgstr ""
 #: admin/systems/argonaut/class_argonautClient.inc:169
 #: admin/systems/services/argonaut/class_argonautServer.inc:111
 msgid "Certificate"
-msgstr ""
+msgstr "Certificaat"
 
 #: admin/systems/argonaut/class_argonautClient.inc:169
 msgid "Path to the certificate file on Argonaut client"
@@ -391,7 +394,7 @@ msgstr ""
 #: admin/systems/argonaut/class_argonautClient.inc:174
 #: admin/systems/services/argonaut/class_argonautServer.inc:116
 msgid "CA certificate"
-msgstr ""
+msgstr "CA certificaat"
 
 #: admin/systems/argonaut/class_argonautClient.inc:174
 msgid "Path to the CA certificate file on Argonaut client"
@@ -400,7 +403,7 @@ msgstr ""
 #: admin/systems/argonaut/class_argonautClient.inc:179
 #: admin/systems/services/argonaut/class_argonautServer.inc:121
 msgid "CN of the certificate"
-msgstr ""
+msgstr "CN van het certificaat"
 
 #: admin/systems/argonaut/class_argonautClient.inc:179
 msgid "The CN in this client certificate"
@@ -429,7 +432,7 @@ msgstr "Services"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:47
 msgid "OPSI"
-msgstr ""
+msgstr "OPSI"
 
 #: admin/systems/services/argonaut/class_argonautFuseOPSIConfig.inc:50
 msgid "Opsi admin"
@@ -528,68 +531,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Aanvaard notificatie"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Aanvaard update (puntkomma gescheiden en beindigd)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Aanvaard transfer (puntkomma gescheiden en beindigd)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -600,7 +603,7 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:47
 msgid "LTSP"
-msgstr ""
+msgstr "LTSP"
 
 #: admin/systems/services/argonaut/class_argonautFuseLTSPConfig.inc:50
 msgid "LTSP server"
@@ -628,7 +631,7 @@ msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:64
 msgid "TFTP"
-msgstr ""
+msgstr "TFTP"
 
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:67
 msgid "Pxelinux cfg path"
@@ -810,7 +813,9 @@ msgstr ""
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "U kan een lijst importeren van jobs in de FusionDirectory jobs queue. Dit moet een puntkomma gescheiden lijst met items in het volgende formaat zijn:"
+msgstr ""
+"U kan een lijst importeren van jobs in de FusionDirectory jobs queue. Dit "
+"moet een puntkomma gescheiden lijst met items in het volgende formaat zijn:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
diff --git a/argonaut/locale/pl/fusiondirectory.po b/argonaut/locale/pl/fusiondirectory.po
index d0d3db29fc1b04136d4794278846fa5d575fff58..f53ce43ad81cfccd761e87a5bf8829073f319175 100644
--- a/argonaut/locale/pl/fusiondirectory.po
+++ b/argonaut/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "UsuÅ„"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "WyÅ‚Ä…cz"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Restartuj"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "ZbudÅº"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "Akcje"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Import"
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/pt/fusiondirectory.po b/argonaut/locale/pt/fusiondirectory.po
index 5c87b45b811c4d7cfe6897ce68dc3522818b49e1..abec3da7ce0b8ad42e9f9ce99e68938636876f1a 100644
--- a/argonaut/locale/pt/fusiondirectory.po
+++ b/argonaut/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Remover"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Erro"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "AÃ§Ãµes"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/pt_BR/fusiondirectory.po b/argonaut/locale/pt_BR/fusiondirectory.po
index c7bcc9793244cc7f61ff862ce08f8957c794289d..30d27ae53ec670dcd4abeaf49df7264f00152c3b 100644
--- a/argonaut/locale/pt_BR/fusiondirectory.po
+++ b/argonaut/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr "Servidores mÃºltiplos argonaut encontrados. Apenas um Ã© suportado"
 msgid "There is no argonaut server configured"
 msgstr "Este nÃ£o Ã© um servidor argonaut configurado"
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -57,74 +58,75 @@ msgstr "Remover"
 #: addons/argonaut/class_argonautQueue.inc:124
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Os trabalhos seguintes nÃ£o puderam ser deletados, tivemos que abortar: %s"
+msgstr ""
+"Os trabalhos seguintes nÃ£o puderam ser deletados, tivemos que abortar: %s"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr "InformaÃ§Ãµes"
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr "%s"
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr "Detalhes do erro"
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Erro"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr "NÃ£o foi possÃvel atualizar a fila de entradas"
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr "Imediatamente"
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr "Esperando"
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr "Mostrar erro"
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr "Processado"
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr "em progresso"
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Desligue"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Acordar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "AtualizaÃ§Ã£o de software"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr "(Re)Instalar"
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +209,7 @@ msgid "List of queued jobs"
 msgstr "Lista de filas de trabalho"
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr "Evento"
@@ -229,10 +231,10 @@ msgid "Actions"
 msgstr "AÃ§Ãµes"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Importar"
 
@@ -281,24 +283,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr "ImportaÃ§Ã£o completa: %s eventos enviados corretamente, %s falharam"
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "arquivo estÃ¡ vazio"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -352,7 +354,8 @@ msgstr "Arquivo TaskId"
 
 #: admin/systems/argonaut/class_argonautClient.inc:149
 msgid "File which argonaut will use to store its task id when booting"
-msgstr "Arquivo o qual argonaut usarÃ¡ para armazenar sua task id quando inicializar"
+msgstr ""
+"Arquivo o qual argonaut usarÃ¡ para armazenar sua task id quando inicializar"
 
 #: admin/systems/argonaut/class_argonautClient.inc:154
 #: admin/systems/services/argonaut/class_argonautFuseConfig.inc:55
@@ -528,68 +531,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
-msgstr "Permitir notificar"
+msgid "Notify"
+msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr "Permitir atualizaÃ§Ã£o (separador ponto e vÃrgula e terminou)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr "Permitir TransferÃªncia (separador ponto e vÃrgula e terminou)"
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
@@ -651,7 +654,8 @@ msgstr "Deletar tarefas finalizadas"
 #: admin/systems/services/argonaut/class_argonautServer.inc:50
 msgid ""
 "Wether or not argonaut server should delete successfully finished tasks"
-msgstr "O servidor Argonaut deve deletar ou nÃ£o as tarefas finalizadas com sucesso."
+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 information"
@@ -679,7 +683,8 @@ msgstr "Tempo limite"
 #: admin/systems/services/argonaut/class_argonautServer.inc:73
 msgid ""
 "Time in seconds before to consider an argonaut client or server as down"
-msgstr "Tempo em segundos antes de considerar o servidor ou cliente argonaut caÃdos."
+msgstr ""
+"Tempo em segundos antes de considerar o servidor ou cliente argonaut caÃdos."
 
 #: admin/systems/services/argonaut/class_argonautServer.inc:80
 msgid "Directory in which argonaut will store its log"
@@ -810,7 +815,10 @@ msgstr "Aperte para ativar o modo detalhado"
 msgid ""
 "You can import a list of jobs into the FusionDirectory job queue. This "
 "should be a semicolon seperated list of items in the following format:"
-msgstr "VocÃª pode importas listas de trabalho para a fila de trabalho do FusionDirectory. Isto aparecerÃ¡ como uma semi coluna separado da lista de itens no seguinte formato:"
+msgstr ""
+"VocÃª pode importas listas de trabalho para a fila de trabalho do "
+"FusionDirectory. Isto aparecerÃ¡ como uma semi coluna separado da lista de "
+"itens no seguinte formato:"
 
 #: addons/argonaut/import_events.tpl.c:5
 msgid "timestamp"
diff --git a/argonaut/locale/ru/fusiondirectory.po b/argonaut/locale/ru/fusiondirectory.po
index 0a78dbc508b82bfb30b7e1ed79284f747fa849c9..cf93bf1363ec9751111d8c759e957aa8763e8a4a 100644
--- a/argonaut/locale/ru/fusiondirectory.po
+++ b/argonaut/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "Ð’Ñ‹ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "ÐŸÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "Ð’ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð² Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ðµ"
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "Ñ„Ð°Ð¹Ð» Ð¿ÑƒÑÑ‚Ð¾Ð¹"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr "MAC"
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ru@petr1708/fusiondirectory.po b/argonaut/locale/ru@petr1708/fusiondirectory.po
index 00df7033a1dea114e70823a8c04afbc7529c491f..e3f4c4d0212bc434503fe225cf7e11f35c18fcc7 100644
--- a/argonaut/locale/ru@petr1708/fusiondirectory.po
+++ b/argonaut/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +59,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +229,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +281,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +528,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/sv/fusiondirectory.po b/argonaut/locale/sv/fusiondirectory.po
index 5d8d9094cd92fded7aa814749d3e4f64896b8b7c..88c46232b0253018450205df38160f9f5706f088 100644
--- a/argonaut/locale/sv/fusiondirectory.po
+++ b/argonaut/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "Ta bort"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Fel"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "Ã…tgÃ¤rder"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr "filen Ã¤r tom"
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/ug/fusiondirectory.po b/argonaut/locale/ug/fusiondirectory.po
index 9ec69427ee1df2f6161cb59ef052d58e8bb0fff4..4f2b7cb9f973dfa9d36e562251d53d5e3d384605 100644
--- a/argonaut/locale/ug/fusiondirectory.po
+++ b/argonaut/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +59,72 @@ msgstr ""
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +229,10 @@ msgid "Actions"
 msgstr ""
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +281,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +528,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/vi_VN/fusiondirectory.po b/argonaut/locale/vi_VN/fusiondirectory.po
index 781754b5a34ef9298fb2f1973387e95a70c986bd..27b87680f8c8d705d09d8d26e30191f6086eeda0 100644
--- a/argonaut/locale/vi_VN/fusiondirectory.po
+++ b/argonaut/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "XÃ³a bá»"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "Lá»—i"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "CÃ¡c thao tÃ¡c"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr ""
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/argonaut/locale/zh/fusiondirectory.po b/argonaut/locale/zh/fusiondirectory.po
index 317d456f888b8ce3848d7d20c80d6d546ab2272f..f63e11491ab59c222118d0fb7a3fe8b35fde10d2 100644
--- a/argonaut/locale/zh/fusiondirectory.po
+++ b/argonaut/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 16:10+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,12 +26,12 @@ msgstr ""
 msgid "There is no argonaut server configured"
 msgstr ""
 
-#: include/class_supportDaemon.inc:602
+#: include/class_supportDaemon.inc:608
 #, php-format
 msgid "Could not read \"%s\"!"
 msgstr ""
 
-#: include/class_supportDaemon.inc:606
+#: include/class_supportDaemon.inc:612
 #, php-format
 msgid "\"%s\" is not a file!"
 msgstr ""
@@ -59,72 +60,72 @@ msgstr "åˆ é™¤"
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 msgid "Info"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:189
+#: addons/argonaut/class_argonautQueue.inc:188
 #, php-format
 msgid "%s"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:219
+#: addons/argonaut/class_argonautQueue.inc:214
 msgid "Error detail"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:261
-#: addons/argonaut/class_argonautQueue.inc:345
+#: addons/argonaut/class_argonautQueue.inc:256
+#: addons/argonaut/class_argonautQueue.inc:340
 #: addons/argonaut/class_filterArgonautEvents.inc:39
 #: addons/argonaut/import_events.tpl.c:32
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: addons/argonaut/class_argonautQueue.inc:261
+#: addons/argonaut/class_argonautQueue.inc:256
 #, php-format
 msgid "Cannot update queue entries."
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:329
+#: addons/argonaut/class_argonautQueue.inc:324
 msgid "immediately"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:341
+#: addons/argonaut/class_argonautQueue.inc:336
 msgid "Waiting"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:344
+#: addons/argonaut/class_argonautQueue.inc:339
 msgid "Show error"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:348
+#: addons/argonaut/class_argonautQueue.inc:343
 msgid "Processed"
 msgstr ""
 
-#: addons/argonaut/class_argonautQueue.inc:357
+#: addons/argonaut/class_argonautQueue.inc:352
 msgid "in progress"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:72
+#: addons/argonaut/class_argonautEventTypes.inc:67
 msgid "Switch off"
 msgstr "å…³é—"
 
-#: addons/argonaut/class_argonautEventTypes.inc:85
+#: addons/argonaut/class_argonautEventTypes.inc:80
 msgid "Reboot"
 msgstr "é‡å¯"
 
-#: addons/argonaut/class_argonautEventTypes.inc:89
+#: addons/argonaut/class_argonautEventTypes.inc:84
 msgid "Wake up"
 msgstr "å”¤é†’"
 
-#: addons/argonaut/class_argonautEventTypes.inc:93
+#: addons/argonaut/class_argonautEventTypes.inc:88
 msgid "Software update"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:97
+#: addons/argonaut/class_argonautEventTypes.inc:92
 msgid "(Re)Install"
 msgstr ""
 
-#: addons/argonaut/class_argonautEventTypes.inc:110
+#: addons/argonaut/class_argonautEventTypes.inc:105
 msgid "Refresh slave files (ldap2zone)"
 msgstr ""
 
@@ -207,7 +208,7 @@ msgid "List of queued jobs"
 msgstr ""
 
 #: addons/argonaut/deploy-list.xml:14
-#: addons/argonaut/class_argonautImportFile.inc:184
+#: addons/argonaut/class_argonautImportFile.inc:185
 #: addons/argonaut/import_events.tpl.c:26
 msgid "Event"
 msgstr ""
@@ -229,10 +230,10 @@ msgid "Actions"
 msgstr "åŠ¨ä½œ"
 
 #: 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
+#: addons/argonaut/class_argonautImportFile.inc:97
+#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:145
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "Import"
 msgstr "å¯¼å…¥"
 
@@ -281,24 +282,24 @@ msgstr ""
 msgid "Imported tasks"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:121
+#: addons/argonaut/class_argonautImportFile.inc:122
 msgid "Fix the errors in your CSV file first"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:137
+#: addons/argonaut/class_argonautImportFile.inc:138
 msgid "Infrastructure service"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:144
+#: addons/argonaut/class_argonautImportFile.inc:145
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:156
+#: addons/argonaut/class_argonautImportFile.inc:157
 msgid "file is empty"
 msgstr ""
 
-#: addons/argonaut/class_argonautImportFile.inc:181
+#: addons/argonaut/class_argonautImportFile.inc:182
 #: addons/argonaut/import_events.tpl.c:23
 msgid "MAC"
 msgstr ""
@@ -528,68 +529,68 @@ msgid "Do not write reverse zone"
 msgstr ""
 
 #: admin/systems/services/argonaut/class_argonautDNSConfig.inc:88
-msgid "Allow notify"
+msgid "Notify"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:92
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:93
 msgid "Allow update (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:96
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:97
 msgid "Allow transfer (semicolon separated and ended)"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid "Check names"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:100
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:101
 msgid ""
 "Cause any host name for the zone to be checked for compliance with RFC 952 "
 "and RFC 1123 and take the defined action"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:107
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:108
 msgid "Ldap2zone slave settings"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:112
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:113
 msgid "Manage DNS Slaves"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
 msgid "zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:116
-msgid "DNS zone(s) to be stored as a slave on this server"
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:117
+msgid "DNS zone this server should be declared as slave of"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "master"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:120
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:121
 msgid "Master IP(s) for this zone"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "reverses"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:124
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:125
 msgid "This server should be slave of reverses zones as well"
 msgstr ""
 
-#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:131
+#: admin/systems/services/argonaut/class_argonautDNSConfig.inc:132
 msgid "DNS slaves"
 msgstr ""
 
diff --git a/audit/admin/audit/class_auditEvent.inc b/audit/admin/audit/class_auditEvent.inc
index 4b633ee362c057f52ab79ee8b964e1ce45a60fe3..aeeab6768f19c07cf782353c277c7f67d1af1d05 100644
--- a/audit/admin/audit/class_auditEvent.inc
+++ b/audit/admin/audit/class_auditEvent.inc
@@ -67,7 +67,6 @@ class auditEvent extends simplePlugin
   // The main function : information about attributes
   static function getAttributesInfo ()
   {
-    global $config;
     return array(
       'main' => array(
         'name'  => _('Event'),
diff --git a/audit/locale/ar/fusiondirectory.po b/audit/locale/ar/fusiondirectory.po
index 52a035c51e1b02f9b90d7a95c636282ed47321cb..72ae9c91eda64fcf32fc787b5c9a43eec591ee99 100644
--- a/audit/locale/ar/fusiondirectory.po
+++ b/audit/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ca/fusiondirectory.po b/audit/locale/ca/fusiondirectory.po
index 660a4728314818e735b0013e75dec7b43d73cc56..2697ec462ab0b9564009d22d2c817aa9a5582109 100644
--- a/audit/locale/ca/fusiondirectory.po
+++ b/audit/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objecte"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/cs_CZ/fusiondirectory.po b/audit/locale/cs_CZ/fusiondirectory.po
index 4918a34e5dd7c13e1d60a95e65e3b9b1df42f83d..e235dcc5e69cce39eae397bbd55db6a733fca441 100644
--- a/audit/locale/cs_CZ/fusiondirectory.po
+++ b/audit/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "UdÃ¡lost"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "ÄŒas"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Akce"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Typ objektu"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
@@ -127,8 +128,8 @@ msgstr ""
 
 #: admin/audit/class_auditManagement.inc:90
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: admin/audit/class_auditManagement.inc:97
 msgid "Target"
-msgstr "CÃl"
+msgstr "cÃl"
diff --git a/audit/locale/de/fusiondirectory.po b/audit/locale/de/fusiondirectory.po
index a47911d8c8ebab586cc10d7b4ca9dcf953e8800e..2bfd71b56b824748ec76227dc0ffebd365f6aac1 100644
--- a/audit/locale/de/fusiondirectory.po
+++ b/audit/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:37+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr "Audit-Ereignis"
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Ereignis"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Zeit"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Aktion"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Autor"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Objecttyp"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr "Zielobjekt"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr "Attribute"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr "Zielattribute"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr "Ergebnis"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr "Ergebnis oder Fehler"
 
diff --git a/audit/locale/el_GR/fusiondirectory.po b/audit/locale/el_GR/fusiondirectory.po
index 8c4151f165c77bcef80968ecb5a8aecf855fe7d0..5606bda9bb954904e7c4fe9c1fe62aa2a052523a 100644
--- a/audit/locale/el_GR/fusiondirectory.po
+++ b/audit/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Î•Î½ÎÏÎ³ÎµÎ¹Î±"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Î‘Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/en/fusiondirectory.po b/audit/locale/en/fusiondirectory.po
index 7146d68843082793ec14b1832a95604a3ddfe111..6fb53861bce18c3254da896d5e56e2ab9b0ce263 100644
--- a/audit/locale/en/fusiondirectory.po
+++ b/audit/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es/fusiondirectory.po b/audit/locale/es/fusiondirectory.po
index a982e8186940431e9d9a0dd6b589fc07d2287649..d9cbd8776502cbd83462e56f5017ecc2c5fd9636 100644
--- a/audit/locale/es/fusiondirectory.po
+++ b/audit/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tiempo"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "AcciÃ³n"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es_CO/fusiondirectory.po b/audit/locale/es_CO/fusiondirectory.po
index 70974b84fc88dc149c529071f84bde121ff963df..ea4fb14887b9089862847f2ad2ba807cd3b77d0a 100644
--- a/audit/locale/es_CO/fusiondirectory.po
+++ b/audit/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/es_VE/fusiondirectory.po b/audit/locale/es_VE/fusiondirectory.po
index 55ebe5cd87cb21a9abea1f20abb93e2cfa86df93..b5331b453051116ada1008d4fec4793b410e8526 100644
--- a/audit/locale/es_VE/fusiondirectory.po
+++ b/audit/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tiempo"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "AcciÃ³n"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/fa_IR/fusiondirectory.po b/audit/locale/fa_IR/fusiondirectory.po
index 5dd3c1b12d4bb81472026e6b9a1c9c297c5a9820..544723430a804527a97ccc3c122b9ffe02f93a3b 100644
--- a/audit/locale/fa_IR/fusiondirectory.po
+++ b/audit/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/fi_FI/fusiondirectory.po b/audit/locale/fi_FI/fusiondirectory.po
index d477bf9c902c243b440aa2a43c141de7f3f03730..7e6c09d27c026116ccb77ff8182eb63f5e4f5780 100644
--- a/audit/locale/fi_FI/fusiondirectory.po
+++ b/audit/locale/fi_FI/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Dina Solveig Jalkanen, 2016
-# Dina Solveig Jalkanen, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Aika"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr "Tapahtuman pÃ¤ivÃ¤mÃ¤Ã¤rÃ¤ ja kellonaika"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Toiminto"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr "Toimintotyyppi"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "TekijÃ¤"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr "Toiminnon tekijÃ¤"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr "Ominaisuudet"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr "Lopputulos"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr "Lopputulos tai virhe"
 
diff --git a/audit/locale/fr/fusiondirectory.po b/audit/locale/fr/fusiondirectory.po
index 5a89bd9f3d030b3fb3dcce6e8c7213bdf8202634..6b84d4e643c90bea8bf04801b8861729cd9830db 100644
--- a/audit/locale/fr/fusiondirectory.po
+++ b/audit/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,11 +33,11 @@ msgstr "Audit"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Audit RDN"
-msgstr "Branche Audit"
+msgstr "Audit RDN"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Branch in which audit events will be stored"
-msgstr "Branche dans laquelle les Ã©vÃ©nements d'audit sont stockÃ©s"
+msgstr "Branche dans laquelle les audit sont stockÃ©s"
 
 #: config/audit/class_auditConfig.inc:50
 msgid "Actions to audit"
@@ -49,7 +49,7 @@ msgstr "Quelles actions doivent Ãªtre stockÃ©s dans journal d'audit"
 
 #: config/audit/class_auditConfig.inc:57
 msgid "Days to keep"
-msgstr "DurÃ©e de rentention"
+msgstr "Nombre de jours a conserver"
 
 #: config/audit/class_auditConfig.inc:57
 msgid "Number of days of audit to keep in the LDAP when cleaning"
@@ -61,70 +61,72 @@ msgstr "Ã‰vÃ©nement d'audit"
 
 #: admin/audit/class_auditEvent.inc:54
 msgid "An event like ldap modification which was registered by audit plugin"
-msgstr "Un Ã©vÃ©nement comme une modification ldap qui a Ã©tÃ© enregistrÃ© par le plugin d'audit"
+msgstr ""
+"Un Ã©vÃ©nement comme une modification ldap qui a Ã©tÃ© enregistrÃ© par le plugin "
+"d'audit"
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Ã‰vÃ¨nement"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Temps"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr "Date et heure a laquelle cet Ã©vÃ©nement est arrivÃ©"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Action"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr "Type d'action"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Auteur"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr "Auteur de l'action"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Type d'objet"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objet"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr "Objet cible"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr "Attributs"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr "Attributs cibles"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr "RÃ©sultat"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr "RÃ©sultat ou erreur"
 
 #: admin/audit/class_auditManagement.inc:41
 msgid "Audit events display"
-msgstr "Ã‰vÃ©nement d'audit"
+msgstr "Affichage des Ã©vÃ©nements d'audit"
 
 #: admin/audit/class_auditManagement.inc:90
 msgid "Type"
diff --git a/audit/locale/hu_HU/fusiondirectory.po b/audit/locale/hu_HU/fusiondirectory.po
index 817138f54d989b0de8275a2eace215b7dbd4c8bb..c4afc6c080c6d58d4039ea8b8b3c9ecd63e7a7cb 100644
--- a/audit/locale/hu_HU/fusiondirectory.po
+++ b/audit/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/id/fusiondirectory.po b/audit/locale/id/fusiondirectory.po
index 133c09a28159aa050c67bf23cd4185d3ed97ad7a..7b2608aa6a5da5ac1d472bcc751af4066d9245b1 100644
--- a/audit/locale/id/fusiondirectory.po
+++ b/audit/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/it_IT/fusiondirectory.po b/audit/locale/it_IT/fusiondirectory.po
index 84f46d6c680d87374f50929d9ae6ead867f02a4f..b6095fc70f7bf76e49ce3029bef1e2d1ee450c95 100644
--- a/audit/locale/it_IT/fusiondirectory.po
+++ b/audit/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,64 +61,66 @@ msgstr "Evento di controllo"
 
 #: admin/audit/class_auditEvent.inc:54
 msgid "An event like ldap modification which was registered by audit plugin"
-msgstr "Un evento come la modifica LDAP che Ã¨ stato registrato dal plug-in di revisione"
+msgstr ""
+"Un evento come la modifica LDAP che Ã¨ stato registrato dal plug-in di "
+"revisione"
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tempo"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr "Data e ora in cui questo evento Ã© accaduto"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Azione"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr "Tipo di azione"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr "Autore"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr "Azione autore"
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Tipo di oggetto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Oggetto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr "Oggetto di destinazione"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr "Attributi"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr "Attributi di destinazione"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr "Risultato"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr "Risultato o errore"
 
diff --git a/audit/locale/lv/fusiondirectory.po b/audit/locale/lv/fusiondirectory.po
index b8eb4b15aa32314c427a2151ee161ef6c2253131..317afc8dfb8730a0efca36aa6a47bd033e481c2e 100644
--- a/audit/locale/lv/fusiondirectory.po
+++ b/audit/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/nb/fusiondirectory.po b/audit/locale/nb/fusiondirectory.po
index a2e0afcbc1184a7eaf98c49e8d115a351e5d7e08..50b6b0fdf904cfca0194d24be1c1243b6b41979d 100644
--- a/audit/locale/nb/fusiondirectory.po
+++ b/audit/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/nl/fusiondirectory.po b/audit/locale/nl/fusiondirectory.po
index 9bc5b04070dad5d1b027ed10c901055438ce665c..3faf4711f0b64cbfeb726746145917f646c7f43f 100644
--- a/audit/locale/nl/fusiondirectory.po
+++ b/audit/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,20 +20,20 @@ msgstr ""
 
 #: config/audit/class_auditConfig.inc:28
 msgid "Audit configuration"
-msgstr ""
+msgstr "Audit configuratie"
 
 #: config/audit/class_auditConfig.inc:29
 msgid "FusionDirectory audit plugin configuration"
-msgstr ""
+msgstr "FusionDirectory audit plugin configuratie"
 
 #: config/audit/class_auditConfig.inc:41
 #: admin/audit/class_auditManagement.inc:40
 msgid "Audit"
-msgstr ""
+msgstr "Audit"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Audit RDN"
-msgstr ""
+msgstr "Audit RDN"
 
 #: config/audit/class_auditConfig.inc:44
 msgid "Branch in which audit events will be stored"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Event"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr "Tijd"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Actie"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
-msgstr ""
+msgstr "Auteur"
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
-msgstr ""
+msgstr "Object type"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Object"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
-msgstr ""
+msgstr "Attributen"
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
-msgstr ""
+msgstr "Resultaat"
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pl/fusiondirectory.po b/audit/locale/pl/fusiondirectory.po
index e18af81dd9765b6dcac15be3ae11f97206ed4f62..8ffb9470ef665ffcbe74d43c083db784db9714cb 100644
--- a/audit/locale/pl/fusiondirectory.po
+++ b/audit/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Akcja"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Obiekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pt/fusiondirectory.po b/audit/locale/pt/fusiondirectory.po
index 118fb51d4107aaf2584cd259a6c8a9ad27c4c1e1..6105331c7ce7c8107f2a40a3f4cb8f0476beb058 100644
--- a/audit/locale/pt/fusiondirectory.po
+++ b/audit/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/pt_BR/fusiondirectory.po b/audit/locale/pt_BR/fusiondirectory.po
index d5c29964ab3177c19c4eab547aff2627647e970a..d1cbc9201bec45e880480dd5d170206b30b9d1f4 100644
--- a/audit/locale/pt_BR/fusiondirectory.po
+++ b/audit/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr "Evento"
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "AÃ§Ã£o"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objeto"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ru/fusiondirectory.po b/audit/locale/ru/fusiondirectory.po
index 91bb069cfd9603f98f44a13aa57b9eeda73969c5..4b59cd87f94763d464685fd948cc11a77e9c748b 100644
--- a/audit/locale/ru/fusiondirectory.po
+++ b/audit/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr "Ð¢Ð¸Ð¿ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "ÐžÐ±ÑŠÐµÐºÑ‚"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ru@petr1708/fusiondirectory.po b/audit/locale/ru@petr1708/fusiondirectory.po
index cb38fec1103a5487e682122bb1b1f7ad68afd321..8f5183b244e81e8a4d211cdfac16b2b880df3672 100644
--- a/audit/locale/ru@petr1708/fusiondirectory.po
+++ b/audit/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/sv/fusiondirectory.po b/audit/locale/sv/fusiondirectory.po
index d6ad8d6466c6e83076474818d79c0e005774cadb..678e2137f657b1166bc1e95e17cedfc5d930adb2 100644
--- a/audit/locale/sv/fusiondirectory.po
+++ b/audit/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "Ã…tgÃ¤rd"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Objekt"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/ug/fusiondirectory.po b/audit/locale/ug/fusiondirectory.po
index 8ffab76a82f8859c50ac4f77365ccb457b3469d3..4037b2ef2c7b74b93a9ee58ef0a10772a14b8f50 100644
--- a/audit/locale/ug/fusiondirectory.po
+++ b/audit/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +62,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/vi_VN/fusiondirectory.po b/audit/locale/vi_VN/fusiondirectory.po
index 46e709b8f743573c2edc6612d8efc1345e12c399..10261843147f940ea6812b1c35b670c020c86853 100644
--- a/audit/locale/vi_VN/fusiondirectory.po
+++ b/audit/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "Ä‘á»‘i tÆ°á»£ng"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/audit/locale/zh/fusiondirectory.po b/audit/locale/zh/fusiondirectory.po
index a0d9d060c6032dc5545c53a985b26f7927468def..a24e0e09542dd8736f5528fa0c2c911b1c1a0bed 100644
--- a/audit/locale/zh/fusiondirectory.po
+++ b/audit/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,62 @@ msgstr ""
 msgid "An event like ldap modification which was registered by audit plugin"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:73
+#: admin/audit/class_auditEvent.inc:72
 msgid "Event"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 #: admin/audit/class_auditManagement.inc:69
 msgid "Time"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:76
+#: admin/audit/class_auditEvent.inc:75
 msgid "Date and time this event happened"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 #: admin/audit/class_auditManagement.inc:83
 msgid "Action"
 msgstr "è¡ŒåŠ¨"
 
-#: admin/audit/class_auditEvent.inc:79
+#: admin/audit/class_auditEvent.inc:78
 msgid "Action type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 #: admin/audit/class_auditManagement.inc:76
 msgid "Author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:80
+#: admin/audit/class_auditEvent.inc:79
 msgid "Action author"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:81
+#: admin/audit/class_auditEvent.inc:80
 msgid "Object type"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Object"
 msgstr "å¯¹è±¡"
 
-#: admin/audit/class_auditEvent.inc:82
+#: admin/audit/class_auditEvent.inc:81
 msgid "Target object"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:83
+#: admin/audit/class_auditEvent.inc:82
 msgid "Target attributes"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result"
 msgstr ""
 
-#: admin/audit/class_auditEvent.inc:84
+#: admin/audit/class_auditEvent.inc:83
 msgid "Result or error"
 msgstr ""
 
diff --git a/autofs/locale/ar/fusiondirectory.po b/autofs/locale/ar/fusiondirectory.po
index bccb05c9834b7778dcc44a9e2e7d38e6b273d9e0..adceeb69b9cf158c6fc3936bc2c7b6e9e456d2a5 100644
--- a/autofs/locale/ar/fusiondirectory.po
+++ b/autofs/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/ca/fusiondirectory.po b/autofs/locale/ca/fusiondirectory.po
index 9f4cec4109e5f5f0e11d023626cdef645b398232..64eb57eb81fc1dca3583b885cb5e84e30b4f3e62 100644
--- a/autofs/locale/ca/fusiondirectory.po
+++ b/autofs/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/cs_CZ/fusiondirectory.po b/autofs/locale/cs_CZ/fusiondirectory.po
index 5dbf4810bb6bce65b786da2fdb8e3090b1e661b4..ca9f8cd205d3624fdeaf722522e3aef9d31f87e3 100644
--- a/autofs/locale/cs_CZ/fusiondirectory.po
+++ b/autofs/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,16 +36,18 @@ msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr "VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡ny Ãºdaje pro automatickÃ© pÅ™ipojovÃ¡nÃ souborovÃ½ch systÃ©mÅ¯"
+msgstr ""
+"VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡ny Ãºdaje pro automatickÃ© pÅ™ipojovÃ¡nÃ souborovÃ½ch"
+" systÃ©mÅ¯"
 
 #: 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"
-msgstr "SloÅ¾ka"
+msgstr "adresÃ¡Å™"
 
 #: admin/autofs/class_nisObject.inc:58 admin/autofs/class_nisMap.inc:53
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/autofs/class_nisObject.inc:58
 msgid "Name of this directory"
@@ -58,12 +61,14 @@ msgstr "PoloÅ¾ka automatickÃ©ho pÅ™ipojenÃ (automount)"
 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â€œ"
+msgstr ""
+"PoloÅ¾ka tÃ©to sloÅ¾ky pro systÃ©movou sluÅ¾bu automount.\n"
+"NapÅ™Ãklad â€žauto.uâ€œ nebo â€ž-fstype=nfs nazevdomeny.tld:/pripojna/sloÅ¾kaâ€œ"
 
 #: 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"
+msgstr "pÅ™ÃpojnÃ½ bod"
 
 #: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
diff --git a/autofs/locale/de/fusiondirectory.po b/autofs/locale/de/fusiondirectory.po
index d068247fc17dea73405dc39716e738ba80105468..320d7edc98a8e4bee19b6e20859bf5edf25c242f 100644
--- a/autofs/locale/de/fusiondirectory.po
+++ b/autofs/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,7 +59,9 @@ msgstr "Automounteintrag"
 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'"
+msgstr ""
+"Der Eintrag dieses Verzeichnisses fÃ¼r den automount Daemon.\n"
+"Zum Beispiel 'auto.u' oder '-fstype=nfs domain.tld:/mount/directory'"
 
 #: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
diff --git a/autofs/locale/el_GR/fusiondirectory.po b/autofs/locale/el_GR/fusiondirectory.po
index 52dfcdf91f5a017791dbc5c001014713b40a758e..f56af9102f26563f9060f14152ea2e9af043955b 100644
--- a/autofs/locale/el_GR/fusiondirectory.po
+++ b/autofs/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,7 +59,9 @@ msgstr "ÎšÎ±Ï„Î±Ï‡ÏŽÏÎ·ÏƒÎ· Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î·Ï‚ Ï€ÏÎ¿ÏƒÎ¬ÏÏ„Î·ÏƒÎ·Ï‚"
 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'"
+msgstr ""
+"Î— ÎµÎ³Î³ÏÎ±Ï†Î® Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… Î³Î¹Î± Ï„Î¿Î½ automount daemon.\n"
+" Î“Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± 'auto.u' or '-fstype=nfs domaine.tld:/mount/directory'"
 
 #: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
diff --git a/autofs/locale/en/fusiondirectory.po b/autofs/locale/en/fusiondirectory.po
index 208e40c0fc841670e74e8ab0aaed1da9d714bdd9..e9fa444c1d8b07a5f8e8f7738805090cefd01271 100644
--- a/autofs/locale/en/fusiondirectory.po
+++ b/autofs/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/autofs/locale/es/fusiondirectory.po b/autofs/locale/es/fusiondirectory.po
index 0db29ff07b31592439894d8fefaf40f39720648f..91945f21dcad597837d14ebca0c7a50f6f194d84 100644
--- a/autofs/locale/es/fusiondirectory.po
+++ b/autofs/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/es_CO/fusiondirectory.po b/autofs/locale/es_CO/fusiondirectory.po
index 4f23259c1935f8c7dc8f2d48794c29cf422dc13a..3e132f4503a154afd614a33945a8cc6417a78198 100644
--- a/autofs/locale/es_CO/fusiondirectory.po
+++ b/autofs/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/es_VE/fusiondirectory.po b/autofs/locale/es_VE/fusiondirectory.po
index 320555d579a2053ba7ca4afe20b6306d71185c11..1207de4a46219ac567f04c00879f4d27aaae6707 100644
--- a/autofs/locale/es_VE/fusiondirectory.po
+++ b/autofs/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/fa_IR/fusiondirectory.po b/autofs/locale/fa_IR/fusiondirectory.po
index f322ffc3cb1b976d7be1c89ac3719f0bfc26555c..95ed68b9ea8825d14bbe361131a1340b0a0a4350 100644
--- a/autofs/locale/fa_IR/fusiondirectory.po
+++ b/autofs/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/fi_FI/fusiondirectory.po b/autofs/locale/fi_FI/fusiondirectory.po
index 9c5a353b06d7c0ecaa1465dc8a6db4cc80830fac..7487e9bc00fdfe5c010ac2c35e4ee96f2c7ce798 100644
--- a/autofs/locale/fi_FI/fusiondirectory.po
+++ b/autofs/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/fr/fusiondirectory.po b/autofs/locale/fr/fusiondirectory.po
index 9e6035b7271d7b7b6740fc99fca0e9d0ce0f354c..faf0db649ac20f87aadd54dd27eff51e8b503290 100644
--- a/autofs/locale/fr/fusiondirectory.po
+++ b/autofs/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr "Configuration Autofs"
+msgstr "Configuration Automount"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr "Configuration du plugin autofs"
+msgstr "Configuration du plugin automount"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
@@ -32,11 +32,11 @@ msgstr "AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "AutoFS RDN"
-msgstr "Branche Autofs"
+msgstr "RDN Automount"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les points de montage automount"
+msgstr "Branche oÃ¹ seront stockÃ©s  les point de montage automount"
 
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
@@ -59,7 +59,9 @@ msgstr "EntrÃ©e automount"
 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Â»"
+msgstr ""
+"L'entrÃ©e de ce rÃ©pertoire pour le dÃ©mon automount. âŽ\n"
+"Par exemple Â«auto.uÂ» ou Â«-fstype=nfs domaine.tld mount/rÃ©pertoire '"
 
 #: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
@@ -68,11 +70,11 @@ msgstr "Point de montage"
 
 #: admin/autofs/class_nisObject.inc:68
 msgid "The mount point this directory will be placed in"
-msgstr "Le point de montage dans lequel ce rÃ©pertoire sera mis"
+msgstr "Le point de montage de ce rÃ©pertoire sera mis dans"
 
 #: admin/autofs/class_autofsManagement.inc:31
 msgid "Auto fs"
-msgstr "Auto fs"
+msgstr "Automount"
 
 #: admin/autofs/class_autofsManagement.inc:32
 msgid "Auto fs management"
diff --git a/autofs/locale/hu_HU/fusiondirectory.po b/autofs/locale/hu_HU/fusiondirectory.po
index f46857515fd48a85adda7fb294b9ab9f5218df0d..085e92fec259268a2b9c7b701a8b08a40052284f 100644
--- a/autofs/locale/hu_HU/fusiondirectory.po
+++ b/autofs/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/id/fusiondirectory.po b/autofs/locale/id/fusiondirectory.po
index 67f1049e940b95611c124ad8715b5d6e2b532eb6..b56028e84095f1c10776d8d9429659b8b44ea59b 100644
--- a/autofs/locale/id/fusiondirectory.po
+++ b/autofs/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/it_IT/fusiondirectory.po b/autofs/locale/it_IT/fusiondirectory.po
index 72722a2ca2519e8907e83451efc2a41aaa6b1455..65bf5739870d1293e039d760318ca0c7b357350f 100644
--- a/autofs/locale/it_IT/fusiondirectory.po
+++ b/autofs/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:20+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +36,8 @@ msgstr "RDN Autofs"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
-msgstr "Ramo nel quale saranno immagazzinate le informazioni relative ad automount"
+msgstr ""
+"Ramo nel quale saranno immagazzinate le informazioni relative ad automount"
 
 #: admin/autofs/class_nisObject.inc:31 admin/autofs/class_nisObject.inc:32
 #: admin/autofs/class_nisObject.inc:34 admin/autofs/class_nisObject.inc:54
@@ -61,7 +60,9 @@ msgstr "Voce Automount"
 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'"
+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:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
diff --git a/autofs/locale/lv/fusiondirectory.po b/autofs/locale/lv/fusiondirectory.po
index c81de9fd603c78628ead5adff9649164f82e2393..bd524130902147a047e037e1823c7d9780a89afb 100644
--- a/autofs/locale/lv/fusiondirectory.po
+++ b/autofs/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/nb/fusiondirectory.po b/autofs/locale/nb/fusiondirectory.po
index ea576f3e511b5f0a5e99d8aa4db9bab76bb1f066..2de1cb4e6e6ce309b3b6442569fa6f2cacf95243 100644
--- a/autofs/locale/nb/fusiondirectory.po
+++ b/autofs/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/nl/fusiondirectory.po b/autofs/locale/nl/fusiondirectory.po
index c8c896875bb55980b866f2f89522b3f0831c23f7..8cd800d9d361810fc044206b83c913beaa10e661 100644
--- a/autofs/locale/nl/fusiondirectory.po
+++ b/autofs/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,19 +20,19 @@ msgstr ""
 
 #: config/autofs/class_autofsConfig.inc:28
 msgid "Autofs configuration"
-msgstr ""
+msgstr "Autofs configuratie"
 
 #: config/autofs/class_autofsConfig.inc:29
 msgid "FusionDirectory autofs plugin configuration"
-msgstr ""
+msgstr "FusionDirectory autofs plugin configuratie"
 
 #: config/autofs/class_autofsConfig.inc:42
 msgid "AutoFS"
-msgstr ""
+msgstr "AutoFS"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "AutoFS RDN"
-msgstr ""
+msgstr "AutoFS RDN"
 
 #: config/autofs/class_autofsConfig.inc:45
 msgid "Branch in which automount info will be stored"
@@ -48,7 +49,7 @@ msgstr "Naam"
 
 #: admin/autofs/class_nisObject.inc:58
 msgid "Name of this directory"
-msgstr ""
+msgstr "Naam van de map"
 
 #: admin/autofs/class_nisObject.inc:64
 msgid "Automount entry"
diff --git a/autofs/locale/pl/fusiondirectory.po b/autofs/locale/pl/fusiondirectory.po
index fb39314482c9e3349f39d64580d704d0d12ec308..273b2dc38d75c4cbd9ffa01604640f019daa1397 100644
--- a/autofs/locale/pl/fusiondirectory.po
+++ b/autofs/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/pt/fusiondirectory.po b/autofs/locale/pt/fusiondirectory.po
index 0870144694c96e0820052b8ffd5141e975c6d48e..3b4bdad3036153b6a1645d357fbe1c28a14447f9 100644
--- a/autofs/locale/pt/fusiondirectory.po
+++ b/autofs/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/pt_BR/fusiondirectory.po b/autofs/locale/pt_BR/fusiondirectory.po
index 539ad1ddc91f4f01b6028511f92ebe37316e32e5..6a5b6690051aee0becf7c00250c4dde334981974 100644
--- a/autofs/locale/pt_BR/fusiondirectory.po
+++ b/autofs/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,7 +59,9 @@ msgstr "Entrada de automato"
 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'"
+msgstr ""
+"A entrada deste diretÃ³rio para o daemon de montagem automÃ¡tica.\n"
+"Para a instancia 'auto.u' ou '-fstype=nfs domaine.tld:/mount/directory'"
 
 #: admin/autofs/class_nisObject.inc:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
diff --git a/autofs/locale/ru/fusiondirectory.po b/autofs/locale/ru/fusiondirectory.po
index 75fcfbdba8571db2ae3ec83997039adf85b719f6..f3f99a0f718069e411ad8a86c245f4b0523c645f 100644
--- a/autofs/locale/ru/fusiondirectory.po
+++ b/autofs/locale/ru/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/ru@petr1708/fusiondirectory.po b/autofs/locale/ru@petr1708/fusiondirectory.po
index 463b995234f025d0ef0ad086c97ecd7ae240808d..518bc27b060ab546f2e2bbf90c98a2420ef3f3a6 100644
--- a/autofs/locale/ru@petr1708/fusiondirectory.po
+++ b/autofs/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/sv/fusiondirectory.po b/autofs/locale/sv/fusiondirectory.po
index a58298f022059dfed0b9a7f8c4dd9d39054f2139..4e4232a8fd5427d678672063157780c5824c27fc 100644
--- a/autofs/locale/sv/fusiondirectory.po
+++ b/autofs/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,7 +59,9 @@ msgstr "Automontera post"
 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'"
+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:68 admin/autofs/class_nisMap.inc:31
 #: admin/autofs/class_nisMap.inc:34 admin/autofs/class_nisMap.inc:49
diff --git a/autofs/locale/ug/fusiondirectory.po b/autofs/locale/ug/fusiondirectory.po
index 39b995ba1aefca7a29aac8e13474f0c221c79067..5ef019221f2622fe359b064b1ed5593eacd7601f 100644
--- a/autofs/locale/ug/fusiondirectory.po
+++ b/autofs/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/vi_VN/fusiondirectory.po b/autofs/locale/vi_VN/fusiondirectory.po
index cfa7aa119cbd61ad177a887bcf9c6347e47ed71c..6d105ae5790dabb7198dd1054c3babee9be69ce6 100644
--- a/autofs/locale/vi_VN/fusiondirectory.po
+++ b/autofs/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/autofs/locale/zh/fusiondirectory.po b/autofs/locale/zh/fusiondirectory.po
index 5443120a83ceec275679e7fed0e0dcb54056d29d..f309a29a5acbc1f44fd62595661ae6d0392078cd 100644
--- a/autofs/locale/zh/fusiondirectory.po
+++ b/autofs/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ar/fusiondirectory.po b/certificates/locale/ar/fusiondirectory.po
index b5ed0ef029e769ccda2508e8b1c9202914e07fc7..d3fd7db74ce4542c5a2207a34134895f75df7276 100644
--- a/certificates/locale/ar/fusiondirectory.po
+++ b/certificates/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ca/fusiondirectory.po b/certificates/locale/ca/fusiondirectory.po
index 5e8733379456e284ea87ad8be326f9934ce94199..bd020c28fa4340eaec14ac22fb7e50fa1f204589 100644
--- a/certificates/locale/ca/fusiondirectory.po
+++ b/certificates/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/cs_CZ/fusiondirectory.po b/certificates/locale/cs_CZ/fusiondirectory.po
index c9a564abdf1f2973af16ce99db21cca00f10383a..bb0b1ebef7d5aedb8ef5425195e040a7b8207a12 100644
--- a/certificates/locale/cs_CZ/fusiondirectory.po
+++ b/certificates/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: personal/certificates/class_userCertificates.inc:31
 #: personal/certificates/class_userCertificates.inc:32
 msgid "Download"
-msgstr "StÃ¡hnout si"
+msgstr "staÅ¾enÃ"
 
 #: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
diff --git a/certificates/locale/de/fusiondirectory.po b/certificates/locale/de/fusiondirectory.po
index 420d84c177cb749b82ca8bca4b19596fe924a1d5..465a9df478f71cfcc2fa8e21e1c61ac4c3e28f29 100644
--- a/certificates/locale/de/fusiondirectory.po
+++ b/certificates/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/el_GR/fusiondirectory.po b/certificates/locale/el_GR/fusiondirectory.po
index ddc0b1d64cc9fc4afd095dcedec18e2c1957840f..3da152f02627b26bcb92fd4833f1f96fc3518be3 100644
--- a/certificates/locale/el_GR/fusiondirectory.po
+++ b/certificates/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/en/fusiondirectory.po b/certificates/locale/en/fusiondirectory.po
index 2e5ef69370a1a6666c6ac87455e2c280f6a56dbb..5fb9299b970a7ae8601f742f3ee4610dfb2c097f 100644
--- a/certificates/locale/en/fusiondirectory.po
+++ b/certificates/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/certificates/locale/es/fusiondirectory.po b/certificates/locale/es/fusiondirectory.po
index 60024ad94d0dd854aaf56a4c1a57b08de26e110c..aac62bba0671d6f7b89dfa6977e4b842c7aab959 100644
--- a/certificates/locale/es/fusiondirectory.po
+++ b/certificates/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/es_CO/fusiondirectory.po b/certificates/locale/es_CO/fusiondirectory.po
index 9bec28191af293c8b81482d7cf140492afca5da7..8a5c23a5a7557d28928b2aaf2516bfec4a8b9fc8 100644
--- a/certificates/locale/es_CO/fusiondirectory.po
+++ b/certificates/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/es_VE/fusiondirectory.po b/certificates/locale/es_VE/fusiondirectory.po
index d0a64f196ea7373ab4ebdf781ad2a825a2f081ec..da311cc72043f033546fe9075dd9169058fb4105 100644
--- a/certificates/locale/es_VE/fusiondirectory.po
+++ b/certificates/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/fa_IR/fusiondirectory.po b/certificates/locale/fa_IR/fusiondirectory.po
index 38a659409d2041883a7ce788d2082b9e49cf3215..ba8f3abd9108bd3787abc96fe6fe9597a43cd861 100644
--- a/certificates/locale/fa_IR/fusiondirectory.po
+++ b/certificates/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/fi_FI/fusiondirectory.po b/certificates/locale/fi_FI/fusiondirectory.po
index 17948141c7a11343b18d0c2ce52924bb4e0a1116..bede7c54a6991735f49f70c345a7d14a53d52f84 100644
--- a/certificates/locale/fi_FI/fusiondirectory.po
+++ b/certificates/locale/fi_FI/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Dina Solveig Jalkanen, 2016
-# Dina Solveig Jalkanen, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/fr/fusiondirectory.po b/certificates/locale/fr/fusiondirectory.po
index 0252326fc142f8b25d11cac81c90a3ee095ce555..d863ba6f8bd146c98949b714672f46e830b65146 100644
--- a/certificates/locale/fr/fusiondirectory.po
+++ b/certificates/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: personal/certificates/class_userCertificates.inc:31
 #: personal/certificates/class_userCertificates.inc:32
 msgid "Download"
-msgstr "TÃ©lÃ©charger"
+msgstr "TÃ©lÃ©chargement"
 
 #: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
diff --git a/certificates/locale/hu_HU/fusiondirectory.po b/certificates/locale/hu_HU/fusiondirectory.po
index be36bd27b9b1cf5cdc83b28e44fe5e49c3264dcf..da4baae5dd9bd4b9036057046286508b41da3551 100644
--- a/certificates/locale/hu_HU/fusiondirectory.po
+++ b/certificates/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/id/fusiondirectory.po b/certificates/locale/id/fusiondirectory.po
index 3af09eb3397fd2677585f54dbe5f7e1d06c0c144..f6762720f84737a644e148a0149928ad371adfcb 100644
--- a/certificates/locale/id/fusiondirectory.po
+++ b/certificates/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/it_IT/fusiondirectory.po b/certificates/locale/it_IT/fusiondirectory.po
index 113a5e6dfdabccafa9a6c74cf2a02765271d6bd2..58a3900f95a447c6c0108606ada1c9257b09076a 100644
--- a/certificates/locale/it_IT/fusiondirectory.po
+++ b/certificates/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 14:38+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/lv/fusiondirectory.po b/certificates/locale/lv/fusiondirectory.po
index cd18273b7b62a5bbd0a89d763096cacc8cbdd969..a6ed6ab7c50f3e3f6211b7ea2602df390bb36fec 100644
--- a/certificates/locale/lv/fusiondirectory.po
+++ b/certificates/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/nb/fusiondirectory.po b/certificates/locale/nb/fusiondirectory.po
index 37148466459e9fa809bb53fcd01163354375f36e..d69b18921c3e9633348a5dddbb9863b59208178e 100644
--- a/certificates/locale/nb/fusiondirectory.po
+++ b/certificates/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/nl/fusiondirectory.po b/certificates/locale/nl/fusiondirectory.po
index eb0821cb0a8df0574c6422d7a0831a3e66d7a1f8..5aaf30cb684031adf6d8ef7227b670417d043f65 100644
--- a/certificates/locale/nl/fusiondirectory.po
+++ b/certificates/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr "Downloaden"
 
 #: personal/certificates/class_userCertificates.inc:75
 msgid "Unknown format"
-msgstr ""
+msgstr "Onbekend formaat"
 
 #: personal/certificates/class_userCertificates.inc:117
 #: personal/certificates/class_userCertificates.inc:132
@@ -37,4 +38,4 @@ msgstr "Gebruikerscertificaten"
 
 #: personal/certificates/class_userCertificates.inc:136
 msgid "Certificate content"
-msgstr ""
+msgstr "Inhoud van het certificaat"
diff --git a/certificates/locale/pl/fusiondirectory.po b/certificates/locale/pl/fusiondirectory.po
index f40bc126cc89d19f8443071145a5f8bb7c1815c2..09ada9ba633f0d121edf21d92e26cad009626aa3 100644
--- a/certificates/locale/pl/fusiondirectory.po
+++ b/certificates/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/pt/fusiondirectory.po b/certificates/locale/pt/fusiondirectory.po
index 73aafff671d90d2c8121a8382eadc75f23fd26db..9b5483fbf7a7604cf7d6039d187a5909eba5bd97 100644
--- a/certificates/locale/pt/fusiondirectory.po
+++ b/certificates/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/pt_BR/fusiondirectory.po b/certificates/locale/pt_BR/fusiondirectory.po
index 397d6a09f3cbc191870849480bf25f4163f2b4a0..ed5af67d987a0027fd6d0fe8353d91e5d7f4e90d 100644
--- a/certificates/locale/pt_BR/fusiondirectory.po
+++ b/certificates/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ru/fusiondirectory.po b/certificates/locale/ru/fusiondirectory.po
index 76fea6f6911c112a05c063b2e71406282f6021c4..5acfab6be01c8c897b44757b771a65a3bd637a74 100644
--- a/certificates/locale/ru/fusiondirectory.po
+++ b/certificates/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015-2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ru@petr1708/fusiondirectory.po b/certificates/locale/ru@petr1708/fusiondirectory.po
index 1b2629aceec581f2c087b5e9932a5affc2a6e46c..5b994f5e491f27d9d55eae6ad430f7b47b92a90d 100644
--- a/certificates/locale/ru@petr1708/fusiondirectory.po
+++ b/certificates/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/sv/fusiondirectory.po b/certificates/locale/sv/fusiondirectory.po
index df3b9ed03712a0b6ef0dae0e5b6843a59c9bf31c..6e8ac5cf56b953dff499d4650147bc23dab563a0 100644
--- a/certificates/locale/sv/fusiondirectory.po
+++ b/certificates/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/ug/fusiondirectory.po b/certificates/locale/ug/fusiondirectory.po
index d33c2ce43d446f6e7277de049eaec4043a9711b0..a5f5e241ae51a493e57773cda5f0863757de21e4 100644
--- a/certificates/locale/ug/fusiondirectory.po
+++ b/certificates/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/vi_VN/fusiondirectory.po b/certificates/locale/vi_VN/fusiondirectory.po
index 1e0069a3e482477cc102c104e5968ced6ff0ee0b..7594561698dd342393854132acc8f12fe72dbc1f 100644
--- a/certificates/locale/vi_VN/fusiondirectory.po
+++ b/certificates/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/certificates/locale/zh/fusiondirectory.po b/certificates/locale/zh/fusiondirectory.po
index 408f40574be88faf8856f01c1e97cbf549f54963..bcdb0824dd57c15884c8037a5c1f9fd52e9fe5d5 100644
--- a/certificates/locale/zh/fusiondirectory.po
+++ b/certificates/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/community/admin/departments/community/class_communityOrganization.inc b/community/admin/departments/community/class_communityOrganization.inc
index b05d1f5a308f8877ab14dfd2574218fe8f051c0e..8f6713cbb91070b32d1b6fe92c8c51cfebfc397b 100644
--- a/community/admin/departments/community/class_communityOrganization.inc
+++ b/community/admin/departments/community/class_communityOrganization.inc
@@ -59,15 +59,14 @@ class communityOrganization extends simplePlugin
       'dates' => array(
         'name'  => _('Dates'),
         'attrs' => array(
-          new DateAttribute (
+          new GeneralizedTimeDateAttribute (
             _('Start date'), _('Date of the beginning'),
-            'fdCommunityStartDate', TRUE,
-            'YmdHis\Z'
+            'fdCommunityStartDate', TRUE
           ),
-          new DateAttribute (
+          new GeneralizedTimeDateAttribute (
             _('End date'), _('Date of the end'),
             'fdCommunityEndDate', FALSE,
-            'YmdHis\Z', ''
+            ''
           ),
         )
       ),
diff --git a/community/locale/ar/fusiondirectory.po b/community/locale/ar/fusiondirectory.po
index aed6a8384c93d343753ada17c6c20223f38fd0b2..34a0b2119837928aee3e27798e51524c0ea60ce3 100644
--- a/community/locale/ar/fusiondirectory.po
+++ b/community/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Ø§Ù„Ø¥Ø³Ù… Ø§Ù„Ø£ÙˆÙ„"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Ø§Ù„Ø¥Ø³Ù… Ø§Ù„Ø¹Ø§Ø¦Ù„ÙŠ"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Ø§Ù„Ø¹Ù†ÙˆØ§Ù†"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ø§Ù„Ù…Ø¯ÙŠÙ†Ø©"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Ø§Ù„Ø¨Ù„Ø¯"
diff --git a/community/locale/ca/fusiondirectory.po b/community/locale/ca/fusiondirectory.po
index 53008171b4bfc45430120ffdba6f1bcec181b792..f78dc3f4c82ecab4089a393c9b7b76644b481e02 100644
--- a/community/locale/ca/fusiondirectory.po
+++ b/community/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Nom"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Cognoms"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "AdreÃ§a"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "ProvÃncia"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Estat"
diff --git a/community/locale/cs_CZ/fusiondirectory.po b/community/locale/cs_CZ/fusiondirectory.po
index 24f21a93af47000029ddff9c4e4811b6f649dcd7..ed4ac2984bff77065fc682f6016890ac1e2bd229 100644
--- a/community/locale/cs_CZ/fusiondirectory.po
+++ b/community/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "kontakt"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
-msgstr "JmÃ©no"
+msgstr "jmÃ©no"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
-msgstr "PÅ™ÃjmenÃ"
+msgstr "pÅ™ÃjmenÃ"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
-msgstr "Adresa"
+msgstr "adresa"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "MÄ›sto"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
-msgstr "StÃ¡t"
+msgstr "stÃ¡t"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
-msgstr "ZemÄ›"
+msgstr "zemÄ›"
diff --git a/community/locale/de/fusiondirectory.po b/community/locale/de/fusiondirectory.po
index 128a504377c6c3e1572c3f7236d7802e7d69fc82..3170cbc9e1cf6c072e6d49f65563707bdecb2632 100644
--- a/community/locale/de/fusiondirectory.po
+++ b/community/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:37+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr "Startdatum"
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr "Enddatum"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Kontakt"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Vorname"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Nachname"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr "Eine postalische Anschrift"
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Stadt"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Land"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Land"
diff --git a/community/locale/el_GR/fusiondirectory.po b/community/locale/el_GR/fusiondirectory.po
index 3a27f6823247fad274ff48d0b02d11f824fcbabd..43ca6589218a17a827722965e24b1cc4d0bcb204 100644
--- a/community/locale/el_GR/fusiondirectory.po
+++ b/community/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Î•Ï€Î±Ï†Î®"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Î•Ï€Î¯Î¸ÎµÏ„Î¿"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Î ÏŒÎ»Î·"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Î Î¿Î»Î¹Ï„ÎµÎ¯Î±"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Î§ÏŽÏÎ±"
diff --git a/community/locale/en/fusiondirectory.po b/community/locale/en/fusiondirectory.po
index 93da0ab409a065461ac9bed18e1bbae3df9ce1a8..37a1b424dca8ee35ba0adecceca375e7e6433eeb 100644
--- a/community/locale/en/fusiondirectory.po
+++ b/community/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/es/fusiondirectory.po b/community/locale/es/fusiondirectory.po
index 2dca8dd9602ad74efd0f18ca6e82ef774744527d..c29624c0add486ca08e1ee031c341de6c0db4f82 100644
--- a/community/locale/es/fusiondirectory.po
+++ b/community/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contacto"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Nombre"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Apellido"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ciudad"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "PaÃs"
diff --git a/community/locale/es_CO/fusiondirectory.po b/community/locale/es_CO/fusiondirectory.po
index 7a5e3cb1341609e38d9478dc5458ab702fb6d5a5..d51b0f11763a598749b5222973364182ed018a00 100644
--- a/community/locale/es_CO/fusiondirectory.po
+++ b/community/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Primer nombre"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Apellido"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "PaÃs"
diff --git a/community/locale/es_VE/fusiondirectory.po b/community/locale/es_VE/fusiondirectory.po
index 53abf943fb1497686433d42afeb8315fd55d21f4..355b3b98002a2739ff3eb721904d239b4a07ef8c 100644
--- a/community/locale/es_VE/fusiondirectory.po
+++ b/community/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contacto"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Nombre"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Apellido"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "DirecciÃ³n"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ciudad"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Provincia"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "PaÃs"
diff --git a/community/locale/fa_IR/fusiondirectory.po b/community/locale/fa_IR/fusiondirectory.po
index c7a6a4ddecf07c2db4d9a281022787b0d0a5d82e..3a6ff823f62f47db14e56099efed6225e279b3aa 100644
--- a/community/locale/fa_IR/fusiondirectory.po
+++ b/community/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Ù†Ø§Ù…"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "ÙØ§Ù…ÛŒÙ„"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Ø¢Ø¯Ø±Ø³"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ø´Ù‡Ø±"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Ú©Ø´ÙˆØ±"
diff --git a/community/locale/fi_FI/fusiondirectory.po b/community/locale/fi_FI/fusiondirectory.po
index da90944572502d8993be57a7d02f51a3e71ca0d5..1aa5ce6e1eb1ae148a38689e8043121e98e76f6e 100644
--- a/community/locale/fi_FI/fusiondirectory.po
+++ b/community/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr "AlkupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 msgid "Date of the beginning"
 msgstr "AlkupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr "LoppupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr "LoppupÃ¤ivÃ¤mÃ¤Ã¤rÃ¤"
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Yhteystiedot"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Etunimi"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Osoite"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr "Postiosoite"
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Kaupunki"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Valtio"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Maa"
diff --git a/community/locale/fr/fusiondirectory.po b/community/locale/fr/fusiondirectory.po
index 5dbdd7c7efd3133d305e879972698c16f9652103..224a4fe821ff97d410b7a1ce835deebc832ca355 100644
--- a/community/locale/fr/fusiondirectory.po
+++ b/community/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,7 +36,8 @@ msgstr "Choix du type d'adhÃ©sion"
 
 #: config/community/class_communityConfig.inc:45
 msgid "Community membership types available in the user community tab"
-msgstr "Types d'adhÃ©sion disponibles dans l'onglet communautÃ© de cet d'utilisateur"
+msgstr ""
+"Types d'adhÃ©sion disponibles dans l'onglet communautÃ© de cet d'utilisateur"
 
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
@@ -114,42 +115,42 @@ msgstr "Date de dÃ©but"
 msgid "Date of the beginning"
 msgstr "Date de CrÃ©ation"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr "Date de fin"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr "Date de fin"
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contact"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "PrÃ©nom"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adresse"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr "Adresse postale"
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ville"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "DÃ©partement"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Pays"
diff --git a/community/locale/hu_HU/fusiondirectory.po b/community/locale/hu_HU/fusiondirectory.po
index 132b9bdfcedf51c626cc28af398a023a39d9d3e2..a0325034188fc107df7b427416c4e8ed4e6f1ca6 100644
--- a/community/locale/hu_HU/fusiondirectory.po
+++ b/community/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/id/fusiondirectory.po b/community/locale/id/fusiondirectory.po
index c9074533599c398e37f35d2b8dceee8b158fee17..d3c760c93f21db2be80bbd0da1c007bcbc60bde2 100644
--- a/community/locale/id/fusiondirectory.po
+++ b/community/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/it_IT/fusiondirectory.po b/community/locale/it_IT/fusiondirectory.po
index 19938aca95aaad502bbeafd7120b8b8aea358ed0..3c27f097caaba1ca62102de24dfc039e436dbbc4 100644
--- a/community/locale/it_IT/fusiondirectory.po
+++ b/community/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:20+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +36,9 @@ msgstr "Scelte tipo di abbonamento"
 
 #: config/community/class_communityConfig.inc:45
 msgid "Community membership types available in the user community tab"
-msgstr "Tipi di abbonamento community disponibili nella tabella community dell'utente"
+msgstr ""
+"Tipi di abbonamento community disponibili nella tabella community "
+"dell'utente"
 
 #: admin/departments/community/class_communityProject.inc:29
 msgid "Community project"
@@ -116,42 +116,42 @@ msgstr "Data d'inizio"
 msgid "Date of the beginning"
 msgstr "Data d'inizio"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr "Data di fine"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr "Data di fine"
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contatto"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Nome"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Cognome"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Indirizzo"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr "Un indirizzo postale"
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "CittÃ "
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Regione"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Stato"
diff --git a/community/locale/lv/fusiondirectory.po b/community/locale/lv/fusiondirectory.po
index 64f6720db09ee1f0a07aa66b02ef86a07754db86..ed319f6b637b1fec8927a2d08d7428bb72115332 100644
--- a/community/locale/lv/fusiondirectory.po
+++ b/community/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Kontakts"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "VÄrds"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "UzvÄrds"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adrese"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "PilsÄ“ta"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Valsts"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Valsts"
diff --git a/community/locale/nb/fusiondirectory.po b/community/locale/nb/fusiondirectory.po
index 75b872b47afba868c5b05abcc899835ce206ea64..cb6a93c12b8577f99cb89836c3d6fa23fac2eba5 100644
--- a/community/locale/nb/fusiondirectory.po
+++ b/community/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/nl/fusiondirectory.po b/community/locale/nl/fusiondirectory.po
index cd8f95f323897136a59c81aae586f8080c0c3d2d..e6c9bc20c80a7fc480e6998e48cd720d03834762 100644
--- a/community/locale/nl/fusiondirectory.po
+++ b/community/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: config/community/class_communityConfig.inc:28
 msgid "Community configuration"
-msgstr ""
+msgstr "Community configuratie"
 
 #: config/community/class_communityConfig.inc:29
 msgid "FusionDirectory community plugin configuration"
-msgstr ""
+msgstr "FusionDirectory communicty plugin configuratie"
 
 #: config/community/class_communityConfig.inc:41
 msgid "Community"
-msgstr ""
+msgstr "Community"
 
 #: config/community/class_communityConfig.inc:45
 msgid "Membership type choices"
@@ -47,19 +48,19 @@ msgstr ""
 
 #: admin/departments/community/class_communityProject.inc:42
 msgid "Project"
-msgstr ""
+msgstr "Project"
 
 #: admin/departments/community/class_communityProject.inc:45
 msgid "Project full name"
-msgstr ""
+msgstr "Volledige naam van het project"
 
 #: admin/departments/community/class_communityProject.inc:45
 msgid "Full name of this project"
-msgstr ""
+msgstr "Volledige naam van het project"
 
 #: admin/departments/community/class_communityProject.inc:49
 msgid "Project key"
-msgstr ""
+msgstr "Project sleutel"
 
 #: admin/departments/community/class_communityProject.inc:49
 msgid "ID used for this project in other softwares or databases"
@@ -95,7 +96,7 @@ msgstr ""
 
 #: admin/departments/community/class_communityOrganization.inc:54
 msgid "Hidden"
-msgstr ""
+msgstr "Verborgen"
 
 #: admin/departments/community/class_communityOrganization.inc:54
 msgid "Should this membership be hidden from listings"
@@ -103,52 +104,52 @@ msgstr ""
 
 #: admin/departments/community/class_communityOrganization.inc:60
 msgid "Dates"
-msgstr ""
+msgstr "Data"
 
 #: admin/departments/community/class_communityOrganization.inc:63
 msgid "Start date"
-msgstr ""
+msgstr "Start datum"
 
 #: admin/departments/community/class_communityOrganization.inc:63
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
-msgstr ""
+msgstr "Eind datum"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contact"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Voornaam"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Achternaam"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adres"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Plaats"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Provincie"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Land"
diff --git a/community/locale/pl/fusiondirectory.po b/community/locale/pl/fusiondirectory.po
index 33bc557e5cbb20c92cab5fa69fbeef3fdd87dff5..aa52295fd354ea51a814bc3246c2a3b6189db782 100644
--- a/community/locale/pl/fusiondirectory.po
+++ b/community/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Kontakt"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "ImiÄ™"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adres"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Miasto"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Stan"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Kraj"
diff --git a/community/locale/pt/fusiondirectory.po b/community/locale/pt/fusiondirectory.po
index cdacef9c3c718c2711925a637480589868e2bba7..a708abcd8d3ead23a5bfcb3036998d1cea02f8a0 100644
--- a/community/locale/pt/fusiondirectory.po
+++ b/community/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Ãšltimo nome"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "EndereÃ§o"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "PaÃs"
diff --git a/community/locale/pt_BR/fusiondirectory.po b/community/locale/pt_BR/fusiondirectory.po
index f8146e9dd9fae7c94b75739586036bedfd3a4c73..0f3e278833eae3f0d2b7157f264e8fc069f5029f 100644
--- a/community/locale/pt_BR/fusiondirectory.po
+++ b/community/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "Contato"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Nome"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "EndereÃ§o"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Cidade"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Estado"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "PaÃs"
diff --git a/community/locale/ru/fusiondirectory.po b/community/locale/ru/fusiondirectory.po
index dae5f01f244f57194bf68c5d10f98fd0b198a548..10abbb5d38d948ca815e6f3c4b05ab52e706e07c 100644
--- a/community/locale/ru/fusiondirectory.po
+++ b/community/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -115,42 +114,42 @@ msgstr "Ð”Ð°Ñ‚Ð° Ð½Ð°Ñ‡Ð°Ð»Ð°"
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "Ð˜Ð¼Ñ"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "ÐÐ´Ñ€ÐµÑ"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "Ð“Ð¾Ñ€Ð¾Ð´"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "ÐÐ´Ð¼. ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Ð¡Ñ‚Ñ€Ð°Ð½Ð°"
diff --git a/community/locale/ru@petr1708/fusiondirectory.po b/community/locale/ru@petr1708/fusiondirectory.po
index da18d64f9a8c1b08894e6cf0d7651914f6073a07..84e5d22a634da1074522d0a54c7e9acaa007ba3d 100644
--- a/community/locale/ru@petr1708/fusiondirectory.po
+++ b/community/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/sv/fusiondirectory.po b/community/locale/sv/fusiondirectory.po
index 16766b81bc58383879b7487786016dd1906ab466..6024ca4857dee3854a593b227725acf23b774980 100644
--- a/community/locale/sv/fusiondirectory.po
+++ b/community/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "FÃ¶rnamn"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Efternamn"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Adress"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "LÃ¤n"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Land"
diff --git a/community/locale/ug/fusiondirectory.po b/community/locale/ug/fusiondirectory.po
index 034d9d0d9de71b68d0f8718f881f7fc290f6afbb..2b526ef5d2601d6863b2871393e555e44d9da533 100644
--- a/community/locale/ug/fusiondirectory.po
+++ b/community/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +113,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr ""
diff --git a/community/locale/vi_VN/fusiondirectory.po b/community/locale/vi_VN/fusiondirectory.po
index 2bb5de2cc673a8cc629013864b17433add45e781..4ca909c266a94306688d33bacfee1976fa3188d1 100644
--- a/community/locale/vi_VN/fusiondirectory.po
+++ b/community/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "TÃªn"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "Há»"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "Äá»‹a chá»‰"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "Bang"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "Quá»‘c Gia"
diff --git a/community/locale/zh/fusiondirectory.po b/community/locale/zh/fusiondirectory.po
index 9337fb6dd94ccffdb142b50f367f0b29903c2123..defcdb59718f1a77bb7190bee3691b9392214408 100644
--- a/community/locale/zh/fusiondirectory.po
+++ b/community/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,42 +114,42 @@ msgstr ""
 msgid "Date of the beginning"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "End date"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:68
+#: admin/departments/community/class_communityOrganization.inc:67
 msgid "Date of the end"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:75
+#: admin/departments/community/class_communityOrganization.inc:74
 msgid "Contact"
 msgstr "è”ç³»"
 
-#: admin/departments/community/class_communityOrganization.inc:78
+#: admin/departments/community/class_communityOrganization.inc:77
 msgid "First name"
 msgstr "å"
 
-#: admin/departments/community/class_communityOrganization.inc:82
+#: admin/departments/community/class_communityOrganization.inc:81
 msgid "Last name"
 msgstr "å§“"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "Address"
 msgstr "ä½å€"
 
-#: admin/departments/community/class_communityOrganization.inc:86
+#: admin/departments/community/class_communityOrganization.inc:85
 msgid "A postal address"
 msgstr ""
 
-#: admin/departments/community/class_communityOrganization.inc:90
+#: admin/departments/community/class_communityOrganization.inc:89
 msgid "City"
 msgstr "åŸŽå¸‚"
 
-#: admin/departments/community/class_communityOrganization.inc:94
+#: admin/departments/community/class_communityOrganization.inc:93
 msgid "State"
 msgstr "å·ž/çœ"
 
-#: admin/departments/community/class_communityOrganization.inc:98
+#: admin/departments/community/class_communityOrganization.inc:97
 msgid "Country"
 msgstr "å›½å®¶"
diff --git a/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc b/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
index 2b0165cd679a7bc399fbb3054a2fd64737d59af3..2198034d8a685ce0937c1ab97f065db8cbc85730 100644
--- a/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
+++ b/cyrus/admin/systems/services/cyrus/class_serviceCyrus.inc
@@ -112,11 +112,6 @@ class serviceCyrus extends simpleService
     );
   }
 
-  function save()
-  {
-    parent::save();
-  }
-
   protected function post_save()
   {
     parent::post_save();
diff --git a/cyrus/locale/ar/fusiondirectory.po b/cyrus/locale/ar/fusiondirectory.po
index 09acd02163bc72e862b874a8986866f4393e0103..d299c1f6be704b9d70ca572bb56da680e4462b5b 100644
--- a/cyrus/locale/ar/fusiondirectory.po
+++ b/cyrus/locale/ar/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ca/fusiondirectory.po b/cyrus/locale/ca/fusiondirectory.po
index 943f3ceba0406f98e1b551853d265964adab3bf4..2f7b9d79c0dc25e38871116a8de7be69aea3feb3 100644
--- a/cyrus/locale/ca/fusiondirectory.po
+++ b/cyrus/locale/ca/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 f367910eaf20a6c39b2fe132f8261f753ff2f359..894bdcd9f6aee812b2254e3c1629912ab3c2dba6 100644
--- a/cyrus/locale/cs_CZ/fusiondirectory.po
+++ b/cyrus/locale/cs_CZ/fusiondirectory.po
@@ -1,66 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Nejsou urÄeny Å¾Ã¡dnÃ© poÅ¡tovnÃ servery sluÄitelnÃ© s protokolem IMAP! "
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "PoÅ¡tovnÃ server pro tento ÃºÄet je neplatnÃ½!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
-msgstr "Chyba IMAP"
+msgstr "chyba IMAPu"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "NezdaÅ™ilo se upravit kvÃ³tu pro schrÃ¡nku IMAP: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "informace o zprÃ¡vÄ›"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "PoloÅ¾ka v LDAPu byla odebrÃ¡na, ale schrÃ¡nka (%s) na Cyru zÅ¯stala.\nSmaÅ¾te ji prosÃm ruÄnÄ›!"
+msgstr ""
+"PoloÅ¾ka v LDAPu byla odebrÃ¡na, ale schrÃ¡nka (%s) na Cyru zÅ¯stala.\n"
+"SmaÅ¾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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Modul imap_getacl nenÃ implementovÃ¡n!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, 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:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, 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:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "NedaÅ™Ã se aktivovat skript Sieve: %s"
@@ -72,11 +75,11 @@ msgstr "Cyrus (IMAP/POP3)"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:45
 msgid "Cyrus settings"
-msgstr "NastavenÃ pro Cyrus"
+msgstr "NastavenÃ Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:48
 msgid "Connect URL for Cyrus server"
@@ -94,7 +97,7 @@ msgstr "NÃ¡zev poÄÃtaÄe, na kterÃ©m je provozovÃ¡n Cyrus server"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:56
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:97
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:56
 msgid "Port number on which Cyrus server should be contacted"
@@ -103,7 +106,7 @@ msgstr "ÄŒÃslo portu, na kterÃ©m by mÄ›l bÃ½t kontaktovÃ¡n server Cyrus"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:61
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Option"
-msgstr "PÅ™edvolba"
+msgstr "volba"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:61
 msgid "Options for contacting Cyrus server"
@@ -119,7 +122,7 @@ msgstr "Zda pÅ™i spojovÃ¡nÃ ovÄ›Å™ovat certifikÃ¡t serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user"
-msgstr "SprÃ¡vce"
+msgstr "sprÃ¡vce"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Imap server admin user"
@@ -127,7 +130,7 @@ msgstr "ÃšÄet sprÃ¡vce IMAP serveru"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Admin user password"
diff --git a/cyrus/locale/de/fusiondirectory.po b/cyrus/locale/de/fusiondirectory.po
index 87d12b12559394a92ab45c8267920c7ed112c037..7cd05affd17d283c783d03bfbce94f419eaf50ab 100644
--- a/cyrus/locale/de/fusiondirectory.po
+++ b/cyrus/locale/de/fusiondirectory.po
@@ -1,67 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Es sind keine IMAP-kompatible Mail-Server definiert!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Der Mail-Server fÃ¼r dieses Konto ist ungÃ¼ltig!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "IMAP-Fehler"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kann das IMAP-Postfach nicht verÃ¤ndern: '%s'"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "Mail-Information"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "Der LDAP-Eintrag wurde entfernt, aber die Cyrus-Mailbox (%s) wurde nicht gelÃ¶scht. Bitte lÃ¶schen Sie diesen Eintrag manuell!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Die Funktion imap_getacl ist nicht implementiert!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht beziehen: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kann Sieve-Skript nicht speichern: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kann das Sieve-Skript nicht aktivieren: %s"
@@ -81,7 +83,7 @@ msgstr "Cyruseinstellungen"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:48
 msgid "Connect URL for Cyrus server"
-msgstr "Verbindungs-URL fÃ¼r Cyrus-Server"
+msgstr "Verbindungs URL fÃ¼r Cyrus Server"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
@@ -90,7 +92,7 @@ msgstr "Hostname"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 msgid "Hostname of the Cyrus server"
-msgstr "Hostname des Cyrus-Servers"
+msgstr "Hostname des Cyrusservers"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:56
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:97
@@ -99,7 +101,7 @@ msgstr "Anschluss"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:56
 msgid "Port number on which Cyrus server should be contacted"
-msgstr "Portnummer unter der der Cyrus-Server kontaktiert werden soll"
+msgstr "Portnummer unter der Cyrusserver kontaktiert werden soll"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:61
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
@@ -108,7 +110,7 @@ msgstr "Option"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:61
 msgid "Options for contacting Cyrus server"
-msgstr "Optionen zum Kontaktieren des Cyrus-Servers"
+msgstr "Optionen mit dem Kontakt des Cyrusserver"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Valide certificats"
@@ -140,7 +142,7 @@ msgstr "Sieve-Einstellungen"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Sieve connect URL for Cyrus server"
-msgstr "Sieve Verbindungs-URL fÃ¼r Cyrus-Server"
+msgstr "Sieve Verbindungs URL fÃ¼r Cyrus Server"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname of the Cyrus sieve server"
diff --git a/cyrus/locale/el_GR/fusiondirectory.po b/cyrus/locale/el_GR/fusiondirectory.po
index 9821c4d102bdc20dd2043ab75c3ae0d867ea0dc3..68afa4a885e953526a9354d5fd066ddf08b10131 100644
--- a/cyrus/locale/el_GR/fusiondirectory.po
+++ b/cyrus/locale/el_GR/fusiondirectory.po
@@ -1,67 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Î”ÎµÎ½ ÎÏ‡Î¿Ï…Î½ Î¿ÏÎ¹ÏƒÎ¸ÎµÎ¯ ÏƒÏ…Î¼Î²Î±Ï„Î¿Î¯ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÎÏ‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ IMAP!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
-msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ¿Ï‚!"
+msgstr " Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ¿Ï‚!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Ï„ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ quota Î³ÏÎ±Î¼/ÎºÎ¹Î²Ï‰Ï„Î¯Î¿Ï… IMAP: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "Î— ÎµÎ³Î³ÏÎ±Ï†Î® LDAP ÎÏ‡ÎµÎ¹ Î±Ï€Î¿Î¼Î±ÎºÏÏ…Î½Î¸ÎµÎ¯ Î±Î»Î»Î¬ ÎÏ‡ÎµÎ¹ Î´Î¹Î±Ï„Î·ÏÎ·Î¸ÎµÎ¯ Ï„Î¿ cyrus mailbox (%s) .\nÎ Î±ÏÎ±ÎºÎ±Î»ÏŽ Î´Î¹Î±Î³ÏÎ¬ÏˆÏ„Îµ Ï‡ÎµÎ¹ÏÏ‰Î½Î±ÎºÏ„Î¹ÎºÎ¬!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Î¤Î¿ module imap_getacl  Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î»Î®ÏˆÎ·Ï‚ SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·Ï‚ SIEVE script: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ SIEVE script: %s"
@@ -116,7 +118,9 @@ msgstr "ÎˆÎ³ÎºÏ…ÏÎ± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¬"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Î•Î¬Î½ Î¸Î± Î³Î¯Î½ÎµÏ„Î±Î¹ ÎµÏ€Î¹ÎºÏÏÏ‰ÏƒÎ· Î® ÏŒÏ‡Î¹ Ï„Ï… Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒÏ… Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÏƒÏÎ½Î´ÎµÏƒÎ·"
+msgstr ""
+"Î•Î¬Î½ Î¸Î± Î³Î¯Î½ÎµÏ„Î±Î¹ ÎµÏ€Î¹ÎºÏÏÏ‰ÏƒÎ· Î® ÏŒÏ‡Î¹ Ï„Î¿Ï… Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÎºÎ±Ï„Î¬ Ï„Î·Î½ "
+"ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user"
@@ -132,7 +136,7 @@ msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚:"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Admin user password"
-msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®"
+msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:86
 msgid "Sieve settings"
diff --git a/cyrus/locale/en/fusiondirectory.po b/cyrus/locale/en/fusiondirectory.po
index ca541def250b1d943d455e7f9e24ceb498d67abb..d1f32e5e1258fd1ccb63e5219d3240a123b8bbee 100644
--- a/cyrus/locale/en/fusiondirectory.po
+++ b/cyrus/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,50 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/es/fusiondirectory.po b/cyrus/locale/es/fusiondirectory.po
index 6ba863ebbad40aa7b41aa4e69de6868db49e5f7d..8b1b030b6755b5d8a9d363a346fc82d1866bd703 100644
--- a/cyrus/locale/es/fusiondirectory.po
+++ b/cyrus/locale/es/fusiondirectory.po
@@ -1,66 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Â¡No se han definido servidores IMAP compatibles!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Â¡El servidor de correo para esta cuenta no es vÃ¡lido!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Error IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "No se puede modificar la cuota del buzÃ³n de correo IMAP: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "InformaciÃ³n del correo"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-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!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Â¡No se ha implementado el mÃ³dulo imap_getacl!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, 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:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, 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:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 998ee0ffd3371757b5ba97285aceaebd4be35f2b..d16bdc226ddcf89734b56b6c5934e1508a667196 100644
--- a/cyrus/locale/es_CO/fusiondirectory.po
+++ b/cyrus/locale/es_CO/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 66c9fee6ff98e6b82a11c818751481a17de5d339..c83c4ef65161dd574f6fdff18b5a5fd70ce65a44 100644
--- a/cyrus/locale/es_VE/fusiondirectory.po
+++ b/cyrus/locale/es_VE/fusiondirectory.po
@@ -1,66 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Â¡No se han definido servidores IMAP compatibles!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Â¡El servidor de correo para esta cuenta no es vÃ¡lido!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Error IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "No se puede modificar la cuota del buzÃ³n de correo IMAP: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "InformaciÃ³n del correo"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-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!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Â¡No se ha implementado el mÃ³dulo imap_getacl!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, 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:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, 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:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 7c69a82f6d46fe8e373a034ad29d2f1f7a32ff30..ba3e29327cc9fa9bef11003d3304f4fa1cfcb95c 100644
--- a/cyrus/locale/fa_IR/fusiondirectory.po
+++ b/cyrus/locale/fa_IR/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 5fe71be9d109c7c722cc0d5c8f473d077c51629e..0f357f76326f0a8fecea726fe7c9036c1f9cb4e4 100644
--- a/cyrus/locale/fi_FI/fusiondirectory.po
+++ b/cyrus/locale/fi_FI/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "IMAP virhe"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Ei pysty noutamaan SIEVE skriptia: %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/fr/fusiondirectory.po b/cyrus/locale/fr/fusiondirectory.po
index 9d4ee6f5ae68b667e27a73d498ea4dcb8c981c8d..259a2de8bed14450a4f308461ee2fd00ede8953c 100644
--- a/cyrus/locale/fr/fusiondirectory.po
+++ b/cyrus/locale/fr/fusiondirectory.po
@@ -1,70 +1,74 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible dÃ©finiâ€¯!"
+msgstr "Il n'y a aucun serveur IMAP compatibles dÃ©finis !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de courriel pour ce compte est invalideâ€¯!"
+msgstr "Le serveur de messagerie pour ce compte est non valide !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Erreur IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossible de modifier le quota de la boite IMAPâ€¯: %s"
+msgstr ""
+"Impossible de modifier le quota de la boite de messagerie IMAP. Le serveur "
+"rÃ©pond : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
-msgstr "Informations de courriel"
+msgstr "Informations de messagerie"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-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â€¯!"
+msgstr ""
+"L'entrÃ©e LDAP Ã  Ã©tÃ© supprimÃ©e mais le compte de messagerie (%s) est toujours prÃ©sent dans cyrus.\n"
+"Veuillez l'effacer manuellement !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
-msgstr "Le module imap_getacl n'est pas implÃ©mentÃ©â€¯!"
+msgstr "Le module imap_getacl n'est pas implÃ©mentÃ© !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
-msgstr "Impossible de rÃ©cupÃ©rer le script SIEVEâ€¯: %s"
+msgstr "Impossible de rÃ©cupÃ©rer le script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
-msgstr "Impossible de stocker le script SIEVEâ€¯: %s"
+msgstr "Impossible de stocker le script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
-msgstr "Impossible d'activer le script SIEVEâ€¯: %s"
+msgstr "Impossible d'activer le script SIEVE : %s"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
@@ -73,7 +77,7 @@ msgstr "Cyrus (IMAP/POP3)"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:45
 msgid "Cyrus settings"
@@ -86,7 +90,7 @@ msgstr "URL de connexion au serveur Cyrus"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname"
-msgstr "Nom d'hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 msgid "Hostname of the Cyrus server"
@@ -116,7 +120,7 @@ msgstr "Valider les certificats"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:66
 msgid "Weither or not to validate server certificate on connexion"
-msgstr "Valider ou non le certificat du serveur Ã  la connexion"
+msgstr "Valider ou ne pas valider le certificat du serveur Ã  la connexion"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Admin user"
@@ -124,7 +128,7 @@ msgstr "Administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:76
 msgid "Imap server admin user"
-msgstr "Administrateur du serveur IMAP"
+msgstr "Administrateur du serveur Imap"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Password"
@@ -132,7 +136,7 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Admin user password"
-msgstr "Mot de passe du compte administrateur"
+msgstr "Mot de passe utilisateur Administrateur"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:86
 msgid "Sieve settings"
@@ -140,15 +144,16 @@ msgstr "ParamÃ¨tres Sieve"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:89
 msgid "Sieve connect URL for Cyrus server"
-msgstr "URL de connexion Sieve pour le serveur Cyrus"
+msgstr "URL de connexion pour le serveur Sieve de Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname of the Cyrus sieve server"
-msgstr "Nom d'hÃ´te du serveur Sieve Cyrus"
+msgstr "Nom d'hÃ´te du serveur sieve Cyrus"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:97
 msgid "Port number on which Cyrus sieve server should be contacted"
-msgstr "NumÃ©ro de port sur â€‹â€‹lequel le serveur Sieve de Cyrus doit Ãªtre contactÃ©"
+msgstr ""
+"NumÃ©ro de port sur â€‹â€‹lequel le serveur Sieve de Cyrus doit Ãªtre contactÃ©"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:102
 msgid "Options for contacting Cyrus sieve server"
diff --git a/cyrus/locale/hu_HU/fusiondirectory.po b/cyrus/locale/hu_HU/fusiondirectory.po
index b6bbb9651eb38e5c1f4e39cf63281073d0263237..16ecdeaa75905874b1b146d2e8823922ee3e1dbb 100644
--- a/cyrus/locale/hu_HU/fusiondirectory.po
+++ b/cyrus/locale/hu_HU/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/id/fusiondirectory.po b/cyrus/locale/id/fusiondirectory.po
index 51e167d586122c2ea2680bea1770cc272003172f..402af2d2b480ce259640b459ab1e0f158dd543c4 100644
--- a/cyrus/locale/id/fusiondirectory.po
+++ b/cyrus/locale/id/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 cb88cd7503f63f2c10b79e60244597ce5e108f55..22cfc9f085e5c4025e8a2931073f1754bc6bde51 100644
--- a/cyrus/locale/it_IT/fusiondirectory.po
+++ b/cyrus/locale/it_IT/fusiondirectory.po
@@ -1,69 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:20+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Non Ã¨ stato definito nessun server IMAP compatibile !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Il server di posta elettronica di questo account non Ã¨ valido !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Errore IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
-msgstr "Impossibile modificare la quota della casella di posta elettronica IMAP :%s"
+msgstr ""
+"Impossibile modificare la quota della casella di posta elettronica IMAP :%s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "informazioni Mail"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "L'entry LDAP Ã¨ stata eliminata, ma la casella di posta elettronica (%s) Ã¨ ancora presente in cyrus.\nElimina manualmente !"
+msgstr ""
+"L'entry LDAP Ã¨ stata eliminata, ma la casella di posta elettronica (%s) Ã¨ ancora presente in cyrus.\n"
+"Elimina manualmente !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:416
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "Il modulo imap_getacl non Ã¨ implementato !"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Impossibile recuperare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Impossibile memorizzare lo script SIEVE : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 51af44d0a15305703de48e74179b49ecb32a47d8..a646b6a614bae2a5fa5dcee44c2963df0d63ce84 100644
--- a/cyrus/locale/lv/fusiondirectory.po
+++ b/cyrus/locale/lv/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nb/fusiondirectory.po b/cyrus/locale/nb/fusiondirectory.po
index 46347db5023ac1eaf9e27c3814b9470cae80ad72..851335e47cce5dd350ed33ece2897f6ed3e50d8a 100644
--- a/cyrus/locale/nb/fusiondirectory.po
+++ b/cyrus/locale/nb/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/nl/fusiondirectory.po b/cyrus/locale/nl/fusiondirectory.po
index 8f89f76708a8ead7b7f999022069f7902743453b..522d347a67c99ec506fddb70f7712166c6509f8e 100644
--- a/cyrus/locale/nl/fusiondirectory.po
+++ b/cyrus/locale/nl/fusiondirectory.po
@@ -1,66 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "Er zijn geen IMAP compatibele mail servers gedefinieerd!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Mail server voor deze account is niet geldig!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "IMAP fout"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "Kan IMAP mailbox quota niet wijzigen : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "Mail info"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "LDAP invoer is verwijderd, maar cyrus mailbox (%s) wordt gehouden.âŽ Gelieve deze handmatig te verwijderen!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "De module imap_getacl is niet geÃ¯mplementeerd!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr "Kan SIEVE script niet vinden : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr "Kan SIEVE script niet opslaan : %s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr "Kan SIEVE script niet activeren : %s"
@@ -68,7 +71,7 @@ msgstr "Kan SIEVE script niet activeren : %s"
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:30
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Cyrus (IMAP/POP3)"
-msgstr ""
+msgstr "Cyrus (IMAP/POP3)"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:31
 msgid "Services"
@@ -76,7 +79,7 @@ msgstr "Services"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:45
 msgid "Cyrus settings"
-msgstr ""
+msgstr "Cyrus instellingen"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:48
 msgid "Connect URL for Cyrus server"
@@ -85,7 +88,7 @@ msgstr ""
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:93
 msgid "Hostname"
-msgstr ""
+msgstr "hostname"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:52
 msgid "Hostname of the Cyrus server"
@@ -131,7 +134,7 @@ msgstr "Wachtwoord"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:80
 msgid "Admin user password"
-msgstr ""
+msgstr "Admin gebruikers wachtwoord"
 
 #: admin/systems/services/cyrus/class_serviceCyrus.inc:86
 msgid "Sieve settings"
diff --git a/cyrus/locale/pl/fusiondirectory.po b/cyrus/locale/pl/fusiondirectory.po
index f86bcc764d173e675d4500db43ad14ab097a2954..f23c98494e96fce7c1a9ba81c104796e997e9c37 100644
--- a/cyrus/locale/pl/fusiondirectory.po
+++ b/cyrus/locale/pl/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/pt/fusiondirectory.po b/cyrus/locale/pt/fusiondirectory.po
index d6da08b19755b0f8fd24b6e9c665b7be18a9a228..c076a04cd669ac64b22503a5411bd4dc3dc9acc1 100644
--- a/cyrus/locale/pt/fusiondirectory.po
+++ b/cyrus/locale/pt/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 bd76eb32832b5d785963b0a8c8165b63574de2c2..83910c8c94a90f50e2306ae7f4d310ae5ed3f068 100644
--- a/cyrus/locale/pt_BR/fusiondirectory.po
+++ b/cyrus/locale/pt_BR/fusiondirectory.po
@@ -1,66 +1,69 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "NÃ£o existem servidores de correio IMAP compatÃveis!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr "Servidor de correio para esta conta Ã© invÃ¡lido!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr "Erro de IMAP"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr "ImpossÃvel modificar caixa de e-mail IMAP :%s"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr "InformaÃ§Ã£o de correio"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, php-format
 msgid ""
 "LDAP entry has been removed but cyrus mailbox (%s) is kept.\n"
 "Please delete it manually!"
-msgstr "Entrada LDAP foi removida mas a caixa de correio cyrus (%s) foi mantida. Por favor, delete manualmente!"
+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:456
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr "O modulo imap_getacl nÃ£o estÃ¡ implementado!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, 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:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, 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:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 6cb0cf20c7c6803b5f86f903ae42c5ec4928c9ba..e82c1cb16167e5ea9179e94a1893b8ac1d002ea4 100644
--- a/cyrus/locale/ru/fusiondirectory.po
+++ b/cyrus/locale/ru/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr "ÐÐµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½ IMAP ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ñ‹Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€!"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 ac07f011a33c7b3533ca8c7299b4c41c5c4495b0..d61de825b02cfede5fe0016798d31ed77f130624 100644
--- a/cyrus/locale/ru@petr1708/fusiondirectory.po
+++ b/cyrus/locale/ru@petr1708/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/sv/fusiondirectory.po b/cyrus/locale/sv/fusiondirectory.po
index 3738715bdaa21d17f8bbb833c49532b61eef1eb8..7ec301a422e806c431540a2a0530ff804693075c 100644
--- a/cyrus/locale/sv/fusiondirectory.po
+++ b/cyrus/locale/sv/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/ug/fusiondirectory.po b/cyrus/locale/ug/fusiondirectory.po
index 3eb13a352992d0f08bc3200381da5c7b8dccc79c..1f4099c135ed2a0daca0c2812e46b437874d8c23 100644
--- a/cyrus/locale/ug/fusiondirectory.po
+++ b/cyrus/locale/ug/fusiondirectory.po
@@ -1,66 +1,66 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 f17d3ac52f203dd4c67eb1faebc6f69ee3076240..dec751e317da28c26ad541d78da9e2feca587cbb 100644
--- a/cyrus/locale/vi_VN/fusiondirectory.po
+++ b/cyrus/locale/vi_VN/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, php-format
 msgid "Cannot activate SIEVE script: %s"
 msgstr ""
diff --git a/cyrus/locale/zh/fusiondirectory.po b/cyrus/locale/zh/fusiondirectory.po
index 1bef3c85345ae83ecf385e69c9825a8f3aab78d6..4e8e0ed74a23bde33f87cf9160702ecc6564a66e 100644
--- a/cyrus/locale/zh/fusiondirectory.po
+++ b/cyrus/locale/zh/fusiondirectory.po
@@ -1,66 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:54
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:59
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:55
 msgid "Mail server for this account is invalid!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 msgid "IMAP error"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:246
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:241
 #, php-format
 msgid "Cannot modify IMAP mailbox quota: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:323
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:315
 msgid "Mail info"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:324
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:316
 #, 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
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:404
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:442
 msgid "The module imap_getacl is not implemented!"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:523
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:510
 #, php-format
 msgid "Cannot retrieve SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:592
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:579
 #, php-format
 msgid "Cannot store SIEVE script: %s"
 msgstr ""
 
-#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:599
+#: personal/mail/mail-methods/class_mail-methods-cyrus.inc:586
 #, 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 fd83463528d8e6a838f7def70e887ce932c25f50..8fa1deff78f28ac716ce81da8fa79c8063c8a8db 100644
--- a/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
+++ b/cyrus/personal/mail/mail-methods/class_mail-methods-cyrus.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2017  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,10 +31,6 @@ class mailMethodCyrus extends mailMethod
   /* Allow modification of the mail server attribute existing mail accounts */
   protected $modifyableServer = FALSE;
 
-  /* Enforces same value for 'mail' as used for 'cn' */
-  protected $mailEqualsCN   = FALSE;
-
-  protected $enableDomainSelection  = FALSE;
   protected $enableQuota            = TRUE;
   protected $enableVacationRange    = FALSE;
   protected $enableFolderTypes      = FALSE;
@@ -48,7 +44,7 @@ class mailMethodCyrus extends mailMethod
   public function connect()
   {
     global $config;
-    mailMethod::connect();
+    parent::connect();
 
     if (!count($this->ServerList)) {
       $this->error = _("There are no IMAP compatible mail servers defined!");
@@ -123,16 +119,15 @@ class mailMethodCyrus extends mailMethod
 
   public function disconnect()
   {
-    mailMethod::disconnect();
+    parent::disconnect();
     if ($this->is_connected()) {
       @imap_close ($this->imap_handle);
     }
   }
 
-
   public function is_connected()
   {
-    $ret = mailMethod::is_connected();
+    $ret = parent::is_connected();
     return ($ret && $this->imap_handle);
   }
 
@@ -199,7 +194,7 @@ class mailMethodCyrus extends mailMethod
 
   public function getQuota($quota)
   {
-    mailMethod::getQuota($quota);
+    parent::getQuota($quota);
     if (!$this->quota_loaded) {
       $this->quota_loaded = TRUE;
       $this->loadQuota();
@@ -209,7 +204,7 @@ class mailMethodCyrus extends mailMethod
 
   public function getQuotaUsage()
   {
-    mailMethod::getQuotaUsage();
+    parent::getQuotaUsage();
     if (!$this->quota_loaded) {
       $this->quota_loaded = TRUE;
       $this->loadQuota();
@@ -219,7 +214,7 @@ class mailMethodCyrus extends mailMethod
 
   public function setQuota($number)
   {
-    mailMethod::setQuota($number);
+    parent::setQuota($number);
 
     if (!$this->quotaEnabled()) {
       return TRUE;
@@ -254,11 +249,10 @@ class mailMethodCyrus extends mailMethod
     return TRUE;
   }
 
-
   public function updateMailbox()
   {
     global $config;
-    mailMethod::updateMailbox();
+    parent::updateMailbox();
 
     if (!$this->is_connected() || !$this->imap_handle) {
       trigger_error("Method not connected, catch error.");
@@ -278,31 +272,29 @@ class mailMethodCyrus extends mailMethod
         }
 
         /* Autocreate configured default folders */
-        $folders = $config->get_cfg_value("cyrusAutocreateFolders", NULL);
+        $folders = $config->get_cfg_value('cyrusAutocreateFolders', NULL);
         if ($folders !== NULL) {
-          $cyrus_delim      = ($this->cyrusUseSlashes?"/":".");
+          $cyrus_delim = ($this->cyrusUseSlashes ? '/' : '.');
 
           // Walk thru list of specified folders
           foreach ($folders as $folder) {
-            @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>".$this->account_id."</b>",
-              "<b>IMAP: Add/Update account folder ".$folder."</b> on server :".$this->parent->gosaMailServer);
-            if (!imap_createmailbox($this->imap_handle, $cfg["connect"].$this->account_id.$cyrus_delim.$folder)) {
+            @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '<b>'.$this->account_id.'</b>',
+              '<b>IMAP: Add/Update account folder '.$folder.'</b> on server :'.$this->parent->gosaMailServer);
+            if (!imap_createmailbox($this->imap_handle, $cfg['connect'].$this->account_id.$cyrus_delim.$folder)) {
               $this->error = imap_last_error();
               return FALSE;
             }
           }
-
         }
       }
     }
     return TRUE;
   }
 
-
   public function deleteMailbox()
   {
     global $config;
-    mailMethod::deleteMailbox();
+    parent::deleteMailbox();
 
     if (!$this->is_connected() || !$this->imap_handle) {
       trigger_error("Method not connected, catch error.");
@@ -327,11 +319,8 @@ class mailMethodCyrus extends mailMethod
     return TRUE;
   }
 
-
   public function getMailboxList()
   {
-    mailMethod::getMailboxList();
-
     if (!$this->is_connected() || !$this->imap_handle) {
       trigger_error("Method not connected, catch error.");
       return array();
@@ -404,10 +393,9 @@ class mailMethodCyrus extends mailMethod
     return $result;
   }
 
-
   /*! \brief  Returns configured acls
    */
-  public function  getFolderACLs($folder_acls)
+  public function getFolderACLs($folder_acls)
   {
     $this->reset_error();
 
@@ -425,7 +413,7 @@ class mailMethodCyrus extends mailMethod
     $acls = imap_getacl ($this->imap_handle, $this->account_id);
     foreach ($acls as $user => $acl) {
       if ($user == "anyone") {
-      /* Map to internal placeholder */
+        // Map to internal placeholder
         $user = "__anyone__";
       }
       $folder_acls[$user] = $acl;
@@ -443,11 +431,9 @@ class mailMethodCyrus extends mailMethod
     return $folder_acls;
   }
 
-
-
   /*! \brief  Write ACLs back to imap or what ever
    */
-  public function  setFolderACLs($permissions)
+  public function setFolderACLs($permissions)
   {
     $this->reset_error();
 
@@ -487,21 +473,22 @@ class mailMethodCyrus extends mailMethod
             "<b>IMAP: Setting new folder permissions.</b>");
       }
     }
-    return(TRUE);
+    return TRUE;
   }
 
-
   public function saveSieveSettings()
   {
-    mailMethod::saveSieveSettings();
+    parent::saveSieveSettings();
 
-    /* Map attribute from parent class */
+    /* Map attribute from parent class
+     */
     $mail                     = $this->parent->mail;
     $gosaMailDeliveryMode     = $this->parent->gosaMailDeliveryMode;
     $gosaMailAlternateAddress = $this->parent->gosaMailAlternateAddress;
     $gosaVacationMessage      = $this->parent->gosaVacationMessage;
 
-    /* Try to login into sieve */
+    /* Try to login into sieve
+     */
     $cfg    = $this->ServerList[$this->parent->gosaMailServer];
     $sieve  = new sieve($cfg["sieve_server"], $cfg["sieve_port"], $this->getUAttribValue(),
                         $cfg["password"], $cfg["admin"], $cfg["sieve_option"]);
diff --git a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
index e0e99a12e2a091e2b58ecdd3517e3e91c5bae0ae..46fbdf2215525ec8d4e8cfac7cdfc4b99f6be6d0 100644
--- a/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
+++ b/debconf/admin/debconfProfile/class_debconfProfileGeneric.inc
@@ -41,18 +41,18 @@ class DebconfEntriesAttribute extends CompositeAttribute
 
     /* Load template */
     $ldap = $config->get_ldap_link();
-    $ou   = $this->plugin->attributesAccess['ou']->getValue();
     $ldap->cd("ou=templates,".$this->plugin->dn);
     $ldap->search("(objectClass=debConfDbEntry)");
     while ($entry = $ldap->fetch()) {
       if (isset($entry['cn'][0])) {
         $cn     = $entry['cn'][0];
         $desc   = (isset($entry['description'][0])?$entry['description'][0]:'');
-        $type   = (isset($entry['type'][0])?$entry['type'][0]:'');
         $default  = (isset($entry['value'][0])?$entry['default'][0]:'');
         $this->attributes[$cn] = new StringAttribute ($cn, $desc, "debconfentry_$cn", FALSE, $default);
         $this->attributes[$cn]->setInLdap(FALSE);
         $this->attributes[$cn]->setAcl($this->getAcl());
+        //~ 'choices'
+        //~ 'extendedDescription'
       }
     }
     $ldap->cd("ou=questions,".$this->plugin->dn);
@@ -62,8 +62,11 @@ class DebconfEntriesAttribute extends CompositeAttribute
         $cn = $entry['cn'][0];
         if (isset($this->attributes[$cn])) {
           $this->attributes[$cn]->setValue($entry['value'][0]);
-          /* set initialValue */
+          // set initialValue
           $this->attributes[$cn]->loadValue(NULL);
+          //~ 'flags'
+          //~ 'owners'
+          //~ 'template'
         } else {
           msg_dialog::display(_("Error"),  _("There is no template for this profile"), ERROR_DIALOG);
         }
@@ -111,13 +114,13 @@ class DebconfImportAttribute extends FileAttribute
     $matches = array();
     $str = fread($handle, 1024);
     strpos($str, "dn:");
-    /* removing breaklines */
+    // removing breaklines
     $tmp = str_replace ("\n", "", $str);
-    /* removing spaces */
+    // removing spaces
     $tmp = str_replace (" ", "", $tmp);
-    /* searching for dn: containing the template name */
     if (preg_match( "/dn:.*,ou=templates,ou=([^,=]+),".get_ou("debconfRDN").
                     $config->current['BASE']."/",
+                    // searching for dn: containing the template name
                     $tmp, $matches) > 0) {
       $this->plugin->attributesAccess['ou']->setPostValue($matches[1]);
       $this->plugin->attributesAccess['ou']->setValue($matches[1]);
@@ -132,7 +135,7 @@ class DebconfImportAttribute extends FileAttribute
       try {
         $ldap->import_complete_ldif($str, FALSE, FALSE);
         $this->plugin->initially_was_account = TRUE;
-      } catch (Exception $e) {
+      } catch (FusionDirectoryException $e) {
         msg_dialog::display(_('LDAP error'), $e->getMessage(), ERROR_DIALOG);
       }
     } else {
@@ -212,9 +215,12 @@ class debconfProfileGeneric extends simplePlugin
     }
   }
 
-  function ldap_save($cleanup = TRUE)
+  function ldap_save()
   {
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
+    if (!empty($errors)) {
+      return $errors;
+    }
     if (isset($this->attributesInfo['entries'])) {
       $this->attributesInfo['entries']['attrs']['debconfEntries']->saveInLdap();
     }
diff --git a/debconf/admin/systems/debconf/class_debconfStartup.inc b/debconf/admin/systems/debconf/class_debconfStartup.inc
index afd6c633d29160fb46f23406010c4425a66c8dba..c186d443159d8d6e516b7c3e7bec8e5899e71be4 100644
--- a/debconf/admin/systems/debconf/class_debconfStartup.inc
+++ b/debconf/admin/systems/debconf/class_debconfStartup.inc
@@ -66,10 +66,11 @@ class debconfStartup extends simplePlugin
 
     /* Fill profile select box */
     $ldap = $config->get_ldap_link();
-    $ldap->ls(
+    $ldap->cd(get_ou('debconfRDN').$config->current['BASE']);
+    $ldap->search(
       'objectClass=organizationalUnit',
-      get_ou('debconfRDN').$config->current['BASE'],
-      array('ou')
+      array('ou'),
+      'one'
     );
     $profiles = array();
     while ($attrs = $ldap->fetch()) {
diff --git a/debconf/locale/ar/fusiondirectory.po b/debconf/locale/ar/fusiondirectory.po
index 441f6e74be35590a0b04c45484cb1b69eb04cbc9..02378490f14a36cdaeb66290e38a7c19b71e60a5 100644
--- a/debconf/locale/ar/fusiondirectory.po
+++ b/debconf/locale/ar/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/ca/fusiondirectory.po b/debconf/locale/ca/fusiondirectory.po
index 44a0221f8165dfc812a7e67466001c3349976985..d0d04e6a7324f582d84f2734ab8b0745c3e23c14 100644
--- a/debconf/locale/ca/fusiondirectory.po
+++ b/debconf/locale/ca/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/cs_CZ/fusiondirectory.po b/debconf/locale/cs_CZ/fusiondirectory.po
index 7bc45e48f8a01f8b6adff6fb7e1c5330ea1053b8..30b35659876c35f868b1939d46b766994e209fd8 100644
--- a/debconf/locale/cs_CZ/fusiondirectory.po
+++ b/debconf/locale/cs_CZ/fusiondirectory.po
@@ -1,87 +1,92 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr "Pro tento profil neexistuje Å¡ablona"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, 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:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "Chyba v LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Debconf sada nastavenÃ"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr "Ãšdaje o sadÄ› nastavenÃ Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr "Importovat debconf soubor"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "NÃ¡zev tÃ©to debconf Å¡ablony"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "PoloÅ¾ky"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr "OdpovÄ›di Debconf Å¡ablony"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
-msgstr "Import"
+msgstr "import(ovat)"
 
 #: admin/debconfProfile/class_debconfProfileManagement.inc:32
 #: admin/systems/debconf/class_debconfStartup.inc:33
@@ -102,7 +107,7 @@ msgstr "NastavenÃ pro Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Profile"
-msgstr "Profil"
+msgstr "profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Debconf preseed profile to be used for installation"
@@ -110,7 +115,7 @@ msgstr "Sada pÅ™ednastavenÃ Debconf, pouÅ¾itÃ¡ pro tuto instalaci"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Release"
-msgstr "VydÃ¡nÃ"
+msgstr "vydÃ¡nÃ"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Debian release to install"
@@ -118,4 +123,4 @@ msgstr "VydÃ¡nÃ systÃ©mu Debian, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no"
 
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:2
 msgid "Filter"
-msgstr "Filtr"
+msgstr "filtr"
diff --git a/debconf/locale/de/fusiondirectory.po b/debconf/locale/de/fusiondirectory.po
index 019721090c83f4683651c8a3f98c2487768e2b00..06d02bb03a047632de3e9d1718986cb2dcd3880a 100644
--- a/debconf/locale/de/fusiondirectory.po
+++ b/debconf/locale/de/fusiondirectory.po
@@ -1,86 +1,90 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr "Es gibt keine Vorlage fÃ¼r dieses Profil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, 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:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "LDIF Fehler"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Debconf Profil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr "Debconf-Profilinformation"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Name"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr "Importieren einer debconf Datei"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "Name dieser debconf Vorlage"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "EintrÃ¤ge"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr "Debconf Vorlage Antworten"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importieren"
 
@@ -107,7 +111,8 @@ msgstr "Profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Debconf preseed profile to be used for installation"
-msgstr "Debconf preseed Profil, welches fÃ¼r die Installation verwendet werden soll"
+msgstr ""
+"Debconf preseed Profil, welches fÃ¼r die Installation verwendet werden soll"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Release"
diff --git a/debconf/locale/el_GR/fusiondirectory.po b/debconf/locale/el_GR/fusiondirectory.po
index eae48332b940230c99405c51df98789f47377078..26b3882be259bb3ce9baee999a48cac32bb021c4 100644
--- a/debconf/locale/el_GR/fusiondirectory.po
+++ b/debconf/locale/el_GR/fusiondirectory.po
@@ -1,85 +1,90 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï€ÏÏŒÏ„Ï…Ï€Î¿ Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î»"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÏÏÎµÏƒÎ·Ï‚ Ï„Î·Ï‚ ÎºÎ±Ï„Î±Ï‡ÏŽÏÎ¹ÏƒÎ·Ï‚%s ÏƒÏ„Î¿ LDAP Î³Î¹Î± Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
-msgstr "LDAP Î›Î¬Î¸Î¿Ï‚"
+msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Î ÏÎ¿Ï†Î¯Î» Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï€ÏÎ¿Ï†Î¯Î» Debconf "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® ÎµÎ½ÏŒÏ‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "ÎŒÎ½Î¿Î¼Î±  Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÏŒÏ„Ï…Ï€Î¿ debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "ÎšÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr "Î‘Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î®"
 
diff --git a/debconf/locale/en/fusiondirectory.po b/debconf/locale/en/fusiondirectory.po
index fa23e47a393e17e6e0796f51905e0aa7981167cf..28901676593b3a63e1eb738fd3e456c0f5be62cd 100644
--- a/debconf/locale/en/fusiondirectory.po
+++ b/debconf/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : <br/"
@@ -48,38 +48,38 @@ msgid ""
 "name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/es/fusiondirectory.po b/debconf/locale/es/fusiondirectory.po
index d1fe8ee21fb3d8e3f418ae72d88e19f8bc398af3..cc5d8fa74012518613b0a7cd02a5dc153f1b6b5d 100644
--- a/debconf/locale/es/fusiondirectory.po
+++ b/debconf/locale/es/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/es_CO/fusiondirectory.po b/debconf/locale/es_CO/fusiondirectory.po
index 644dc3d309b9c6c654a21041d0c53f77f2429be7..530672157c41d0e861e855a9eda547da5c40f9ae 100644
--- a/debconf/locale/es_CO/fusiondirectory.po
+++ b/debconf/locale/es_CO/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/es_VE/fusiondirectory.po b/debconf/locale/es_VE/fusiondirectory.po
index 27836c9d42f6a1491cbcab2b485079baace85802..e00af84c593fbacad053d24d2328a3a3ac55644a 100644
--- a/debconf/locale/es_VE/fusiondirectory.po
+++ b/debconf/locale/es_VE/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Error"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/fa_IR/fusiondirectory.po b/debconf/locale/fa_IR/fusiondirectory.po
index a8665526f0c1b9747d65469477d6b9ec88d4728c..deb9becda0b7c0314f8d3dd2ef88987f2b638093 100644
--- a/debconf/locale/fa_IR/fusiondirectory.po
+++ b/debconf/locale/fa_IR/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/fi_FI/fusiondirectory.po b/debconf/locale/fi_FI/fusiondirectory.po
index 4c17ef088586aaa7d4f4b9d47b7d2c1c38837d2d..52b29f3ee38dab2edbd43692a48766c83a2eebc2 100644
--- a/debconf/locale/fi_FI/fusiondirectory.po
+++ b/debconf/locale/fi_FI/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/fr/fusiondirectory.po b/debconf/locale/fr/fusiondirectory.po
index 2f3304fa882975c4c3405a2a3563d8b0346c320a..4acf9864817f23ee356048d1b0b669c4fea0afa3 100644
--- a/debconf/locale/fr/fusiondirectory.po
+++ b/debconf/locale/fr/fusiondirectory.po
@@ -1,86 +1,90 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 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:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, 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"
+msgstr "Impossible de trouver l'entrÃ©e %s dans l'annuaire pour le profil %s"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "Erreur LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+msgstr ""
+"Afin d'importer un fichier \"debconf\", Merci d'executer la commande "
+"suivante: <br/><i>debconf2ldif.pl -b ou=<b>nom</b>,%s -k <b>nom du "
+"fichier</b> > template.ldif </i><br/>Avec <b>nom du fichier</b> le nom du "
+"fichier debconf, et <b>nom</b> le nom dÃ©sirÃ© pour le modÃ¨le.<br/>"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
-msgstr "Information du profil Debconf"
+msgstr "Gestion des profils Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nom"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
-msgstr "Importer un fichier Debconf"
+msgstr "Importer un profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "Nom de ce profil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "EntrÃ©es"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
-msgstr "RÃ©ponses du modÃ¨le Debconf"
+msgstr "RÃ©ponse du modÃ¨le Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importer"
 
@@ -95,11 +99,11 @@ msgstr "Gestion des profils Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:34
 msgid "Debconf preseed startup"
-msgstr "DÃ©marrage par preseed Debconf"
+msgstr "DÃ©marrage du preseed Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:46
 msgid "Debconf settings"
-msgstr "ParamÃ¨tres Debconf"
+msgstr "ParamÃ¨tres de Debconf"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Profile"
@@ -107,7 +111,7 @@ msgstr "Profil"
 
 #: admin/systems/debconf/class_debconfStartup.inc:49
 msgid "Debconf preseed profile to be used for installation"
-msgstr "Profil Debconf preseed Ã  utiliser pour l'installation"
+msgstr "Profil Debconf du fichier preseed Ã  utiliser pour l'installation"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Release"
@@ -115,7 +119,7 @@ msgstr "Version"
 
 #: admin/systems/debconf/class_debconfStartup.inc:53
 msgid "Debian release to install"
-msgstr "Version de Debian Ã  installer"
+msgstr "Release Debian Ã  installer"
 
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:2
 msgid "Filter"
diff --git a/debconf/locale/hu_HU/fusiondirectory.po b/debconf/locale/hu_HU/fusiondirectory.po
index 4d27f8d2806cf36d1b0242e623a9f2d532f0fcc5..7f5dabc00862b01cf3a4019d342b8805fc6f43eb 100644
--- a/debconf/locale/hu_HU/fusiondirectory.po
+++ b/debconf/locale/hu_HU/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/id/fusiondirectory.po b/debconf/locale/id/fusiondirectory.po
index 277cb32678343a637e3848fac4e8c7281d9490b9..b9c880e4031207b8390b606d7665e73c4bd129ab 100644
--- a/debconf/locale/id/fusiondirectory.po
+++ b/debconf/locale/id/fusiondirectory.po
@@ -1,45 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, 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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/it_IT/fusiondirectory.po b/debconf/locale/it_IT/fusiondirectory.po
index a23c8d74d517dfcd3d5e4e5f51cb79f14b0863d4..26d906017c241615eb692b15e28addbcc5bc0d71 100644
--- a/debconf/locale/it_IT/fusiondirectory.po
+++ b/debconf/locale/it_IT/fusiondirectory.po
@@ -1,88 +1,90 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Errore"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr "Non ci sono modelli per questo profilo"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, 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:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "Errore LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Profilo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr "Informazioni profilo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr "Importare un file debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "Nome di questo modello debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "Voci"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr "Risposte al modello Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importa"
 
diff --git a/debconf/locale/lv/fusiondirectory.po b/debconf/locale/lv/fusiondirectory.po
index 47676f17c29461b60bd60fa7aa65efe8dc4a3cdd..7ea225ddaf04c768758b7c23221c455cd5dbd97e 100644
--- a/debconf/locale/lv/fusiondirectory.po
+++ b/debconf/locale/lv/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP kÄ¼Å«da"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/nb/fusiondirectory.po b/debconf/locale/nb/fusiondirectory.po
index e8fe872a564c1d14f1c9360c3d83223985dd0c42..1cb7310e0d519d856e17561cf5a81df0db2fea32 100644
--- a/debconf/locale/nb/fusiondirectory.po
+++ b/debconf/locale/nb/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Feil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Navn"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/nl/fusiondirectory.po b/debconf/locale/nl/fusiondirectory.po
index 629d421c047e0885a36c0bcea4b5e68c3a547d2e..fc9e9cc5f77c79fc88084e6f123bdb020b3ab090 100644
--- a/debconf/locale/nl/fusiondirectory.po
+++ b/debconf/locale/nl/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Fout"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
-msgstr ""
+msgstr "Er is geen template voor dit profiel"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
-msgstr ""
+msgstr "LDIF fout"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Naam"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importeren"
 
diff --git a/debconf/locale/pl/fusiondirectory.po b/debconf/locale/pl/fusiondirectory.po
index a2cae23899dce48bee41d5d1f2911463ad1068f2..2c36beb2e7bb5aa83388d8cdbeaeb81d07e31866 100644
--- a/debconf/locale/pl/fusiondirectory.po
+++ b/debconf/locale/pl/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Import"
 
diff --git a/debconf/locale/pt/fusiondirectory.po b/debconf/locale/pt/fusiondirectory.po
index ce72534f5ea1d99f9b45b0a8dec8b57f040e0311..e20cc706d02b663afb4a39648e82c50f02f5830f 100644
--- a/debconf/locale/pt/fusiondirectory.po
+++ b/debconf/locale/pt/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Erro"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/pt_BR/fusiondirectory.po b/debconf/locale/pt_BR/fusiondirectory.po
index 1b74784aa48caf58cc435a22ff5ffe1200e8a04c..6c9f30a2408014094fb3ae6fb6fde0c1140fca4c 100644
--- a/debconf/locale/pt_BR/fusiondirectory.po
+++ b/debconf/locale/pt_BR/fusiondirectory.po
@@ -1,85 +1,90 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Erro"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr "NÃ£o existe nenhum modelo para este perfil"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, 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:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr "Erro LDIF"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
 "<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/>"
-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/>"
+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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr "Perfil Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Nome"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr "Importar arquivo debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr "Nome deste modelo debconf "
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr "Entradas"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr "Modelo de respostas Debconf"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Importar"
 
diff --git a/debconf/locale/ru/fusiondirectory.po b/debconf/locale/ru/fusiondirectory.po
index 40da9ed40219c14bef18015a6553e44c24411a7b..ad826e65b2b6dfff16eff67f617df8a534a30172 100644
--- a/debconf/locale/ru/fusiondirectory.po
+++ b/debconf/locale/ru/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
diff --git a/debconf/locale/ru@petr1708/fusiondirectory.po b/debconf/locale/ru@petr1708/fusiondirectory.po
index 754397daa656bce47f866725dd3b52ff50069a1c..3a9dd7c0cc67f5494314b7e4ab7e9fc618a98494 100644
--- a/debconf/locale/ru@petr1708/fusiondirectory.po
+++ b/debconf/locale/ru@petr1708/fusiondirectory.po
@@ -1,45 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, 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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/sv/fusiondirectory.po b/debconf/locale/sv/fusiondirectory.po
index db320e944e91c302cf7774801d0a69ddda87d160..06171d13af51a1e36156dab1b2049bdd20e57281 100644
--- a/debconf/locale/sv/fusiondirectory.po
+++ b/debconf/locale/sv/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Fel"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "Namn"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/ug/fusiondirectory.po b/debconf/locale/ug/fusiondirectory.po
index fc9638beab7a5800bec8d201ed21dd66f71c9fbc..e1d914c9a2e97e215eda5978b465069dbb682939 100644
--- a/debconf/locale/ug/fusiondirectory.po
+++ b/debconf/locale/ug/fusiondirectory.po
@@ -1,45 +1,45 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, 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:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/vi_VN/fusiondirectory.po b/debconf/locale/vi_VN/fusiondirectory.po
index b6b9185b529d9cf15a56c5bdd98145fbefbe6992..d35c324476fccecf7dfda9b86d101594f72222b9 100644
--- a/debconf/locale/vi_VN/fusiondirectory.po
+++ b/debconf/locale/vi_VN/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 msgid "Import"
 msgstr ""
 
diff --git a/debconf/locale/zh/fusiondirectory.po b/debconf/locale/zh/fusiondirectory.po
index 126d479b09b0b84ec3c6fb764070963405203724..2ad4c63b2fc5165c9a178fe73bff05b3624358c2 100644
--- a/debconf/locale/zh/fusiondirectory.po
+++ b/debconf/locale/zh/fusiondirectory.po
@@ -1,45 +1,46 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:82
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:85
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:68
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:71
 msgid "There is no template for this profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:83
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:86
 #, php-format
 msgid "Can't find entry %s in LDAP for profile %s"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:136
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:139
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:142
 msgid "LDIF error"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:149
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:152
 #, php-format
 msgid ""
 "In order to import a debconf file, please run the following command : "
@@ -48,38 +49,38 @@ msgid ""
 "the desired name for the template.<br/>"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:165
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:168
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:172
 msgid "Debconf profile"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:166
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:169
 msgid "Debconf profile information"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:184
 #: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 #: admin/debconfProfile/debconfProfile-filter.tpl.c:5
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:186
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:189
 msgid "Import a debconf file"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:187
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:190
 msgid "Name of this debconf template"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:191
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:194
 msgid "Entries"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:193
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:196
 msgid "Debconf template answers"
 msgstr ""
 
-#: admin/debconfProfile/class_debconfProfileGeneric.inc:208
+#: admin/debconfProfile/class_debconfProfileGeneric.inc:211
 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 fefb0fac63441c6cf60cda666d7ef4ed5ddfdc08..86aca1340c88e04d1c2aecbc93f01ecf740a0ce9 100644
--- a/developers/debug-help/addons/debug-help/class_debugHelp.inc
+++ b/developers/debug-help/addons/debug-help/class_debugHelp.inc
@@ -96,7 +96,7 @@ class debugHelp extends simplePlugin
       }
       try {
         $node['attrs']['count'] = objects::count($type);
-      } catch (Exception $e) {
+      } catch (FusionDirectoryException $e) {
         $node['attrs']['count'] = $e->getMessage();
       }
       $dump[] = $node;
diff --git a/developers/locale/ar/fusiondirectory.po b/developers/locale/ar/fusiondirectory.po
index 2afb85b1986c2dcae9f31ee1d5189ace675d47e8..28185b1464b3344444e230a9ea92dbbd12d0f58a 100644
--- a/developers/locale/ar/fusiondirectory.po
+++ b/developers/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/ca/fusiondirectory.po b/developers/locale/ca/fusiondirectory.po
index 571763ca84dff3504f4a6e2dbfd709e0da6bbd9f..36f93a739473e9ae7cd3248712274612a84896f5 100644
--- a/developers/locale/ca/fusiondirectory.po
+++ b/developers/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/cs_CZ/fusiondirectory.po b/developers/locale/cs_CZ/fusiondirectory.po
index 57a400a772054a6ee42453a01ce4f60b73654817..1457ada05406975eeab80efeee850b84559c6fab 100644
--- a/developers/locale/cs_CZ/fusiondirectory.po
+++ b/developers/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -75,7 +76,7 @@ msgstr "ÃšÄet pro FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password for FTP"
@@ -83,7 +84,7 @@ msgstr "Heslo pro FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr "Stroj"
+msgstr "stroj"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -91,7 +92,7 @@ msgstr "PoÄÃtaÄ pro sluÅ¾bu FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
@@ -99,7 +100,7 @@ msgstr "ÄŒÃslo portu por FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:107
 msgid "Demo Plugin"
-msgstr "UkÃ¡zkovÃ½ zÃ¡suvnÃ½ modul"
+msgstr "DemonstraÄnÃ zÃ¡suvnÃ½ modul"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
diff --git a/developers/locale/de/fusiondirectory.po b/developers/locale/de/fusiondirectory.po
index 2677c4ccb3eaecfce60e39041c35fc7496d284b6..82066d482f7f2f9af3815db8d0b0f72278e117ba 100644
--- a/developers/locale/de/fusiondirectory.po
+++ b/developers/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:32+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/el_GR/fusiondirectory.po b/developers/locale/el_GR/fusiondirectory.po
index c76364b602df6163c436b30707d4fa6c267a8118..0ab6d28a432470656cea575df0e1934032533293 100644
--- a/developers/locale/el_GR/fusiondirectory.po
+++ b/developers/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,7 +76,7 @@ msgstr "Î£ÏÎ½Î´ÎµÏƒÎ· Î³Î¹Î± FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password"
-msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
+msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚:"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password for FTP"
diff --git a/developers/locale/en/fusiondirectory.po b/developers/locale/en/fusiondirectory.po
index b7f576398d671229fd8b9ecf87ab4b091459c4b2..ebe74eb698a078b0ad2b456243c3fc5352634c5f 100644
--- a/developers/locale/en/fusiondirectory.po
+++ b/developers/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/developers/locale/es/fusiondirectory.po b/developers/locale/es/fusiondirectory.po
index ce9902db02d62e2cf8514fdf093901f74873ef9e..7945783da7e06c61a149f75df5e7bcbb5510ee9e 100644
--- a/developers/locale/es/fusiondirectory.po
+++ b/developers/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/es_CO/fusiondirectory.po b/developers/locale/es_CO/fusiondirectory.po
index f755e73bf5a35f14df60971de4e1558c73fa34a3..2eeae8e19e0387fcb3771ea197c262cf6e804880 100644
--- a/developers/locale/es_CO/fusiondirectory.po
+++ b/developers/locale/es_CO/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Miguel Ortiz <daychuzleo@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/es_VE/fusiondirectory.po b/developers/locale/es_VE/fusiondirectory.po
index 1dfbcb622e3dde2e5620308383e55a68caf8a757..c37aec201f84102325dd63d3c641380775ebbccc 100644
--- a/developers/locale/es_VE/fusiondirectory.po
+++ b/developers/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/fa_IR/fusiondirectory.po b/developers/locale/fa_IR/fusiondirectory.po
index d1ed2dd4d74e8b42874f647f2cfd8d2cf309818d..550a7ef524563e984a969bf6185c270778a5aabb 100644
--- a/developers/locale/fa_IR/fusiondirectory.po
+++ b/developers/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/fi_FI/fusiondirectory.po b/developers/locale/fi_FI/fusiondirectory.po
index 3bb441be2bb3df193ee133ad80330ae761b996c5..980434d8b4a7966a27006d90a6eba7186beabb1f 100644
--- a/developers/locale/fi_FI/fusiondirectory.po
+++ b/developers/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/fr/fusiondirectory.po b/developers/locale/fr/fusiondirectory.po
index b74174b331e23757de37e76d52289cdeb6916f43..1cdd910d841b7523d0b2944dac8d30a608de08e9 100644
--- a/developers/locale/fr/fusiondirectory.po
+++ b/developers/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +20,7 @@ msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:40
 msgid "Hair Information"
-msgstr "Information sur les cheveux"
+msgstr "Informations sur le cheveux"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -57,7 +56,7 @@ msgstr "A une sonnette"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:76
 msgid "Does the bicycle have a bell"
-msgstr "Est-ce que la bicyclette Ã  une sonnette"
+msgstr "Est ce que la bicyclette Ã  une sonnette"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
 msgid "FTP information"
@@ -105,7 +104,7 @@ msgstr "Plugin de dÃ©monstration"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
-msgstr "Ã‰diter dâ€™inutiles Informations personnelles"
+msgstr "Editer des Informations personnelles"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:26
 #: debug-help/addons/debug-help/class_debugHelp.inc:32
@@ -122,11 +121,11 @@ msgstr "Diagrammes"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:48
 msgid "Object types diagram"
-msgstr "Diagramme des types dâ€™objets"
+msgstr "schÃ©ma des types d'objets "
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:50
 msgid "Get"
-msgstr "TÃ©lÃ©charger"
+msgstr "CrÃ©er"
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:55
 msgid "Object Types"
@@ -134,4 +133,4 @@ msgstr "Types d'objets"
 
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
-msgstr "Permissions insuffisantes"
+msgstr "Droits insuffisants"
diff --git a/developers/locale/hu_HU/fusiondirectory.po b/developers/locale/hu_HU/fusiondirectory.po
index d8eea8a2b519f5facd0e89f0a7508ade70df7df8..c5011aed97ba4af7bee3cfc155484d5fb4ac3ea2 100644
--- a/developers/locale/hu_HU/fusiondirectory.po
+++ b/developers/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/id/fusiondirectory.po b/developers/locale/id/fusiondirectory.po
index 8ff8028abfe4a2308165a58913670b6b4a946395..8959656043ea0f2f63f35c4c3eae72f40adb7590 100644
--- a/developers/locale/id/fusiondirectory.po
+++ b/developers/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/it_IT/fusiondirectory.po b/developers/locale/it_IT/fusiondirectory.po
index 784105a748259d68b227e171bd28d74f4920c5de..c69f9627fe0a2c0bf50ed4be62596f2481130c0c 100644
--- a/developers/locale/it_IT/fusiondirectory.po
+++ b/developers/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:17+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/lv/fusiondirectory.po b/developers/locale/lv/fusiondirectory.po
index 73eb1ca7474735d549cbcdb0e4fd12c2d0c08d67..ecf7beda20829d44733e2a3ac837e5320ac329f5 100644
--- a/developers/locale/lv/fusiondirectory.po
+++ b/developers/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/nb/fusiondirectory.po b/developers/locale/nb/fusiondirectory.po
index 3457609686301a16427c3024c4d3fe73a7219e09..ba968dd4bc48d64ce6cdb36890f4e334a7f75cfa 100644
--- a/developers/locale/nb/fusiondirectory.po
+++ b/developers/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/nl/fusiondirectory.po b/developers/locale/nl/fusiondirectory.po
index 9a8e020cbc894350d75e63b94bb5d671110312f4..430ba6592f78b7a3299dcf73ce0d2a5ce0585f36 100644
--- a/developers/locale/nl/fusiondirectory.po
+++ b/developers/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,23 +24,23 @@ msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
-msgstr ""
+msgstr "Kleur"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:45
 msgid "Color of the hair"
-msgstr ""
+msgstr "Kleur van het haar"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:54
 msgid "Length"
-msgstr ""
+msgstr "Lengte"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
-msgstr ""
+msgstr "Lengte van het haar in cm"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:65
 msgid "Bicycle"
-msgstr ""
+msgstr "Fiets"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:68
 msgid "Brand"
@@ -59,11 +60,11 @@ msgstr ""
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:84
 msgid "FTP information"
-msgstr ""
+msgstr "FTP informatie"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Information for ftp login"
-msgstr ""
+msgstr "Informatie voor de ftp login"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login"
@@ -71,7 +72,7 @@ msgstr "Inlognaam"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login for FTP"
-msgstr ""
+msgstr "Login met FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password"
@@ -79,7 +80,7 @@ msgstr "Wachtwoord"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:91
 msgid "Password for FTP"
-msgstr ""
+msgstr "Wachtwoord van FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -87,7 +88,7 @@ msgstr "Host"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
-msgstr ""
+msgstr "Host voor de FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
@@ -95,11 +96,11 @@ msgstr "Poort"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
-msgstr ""
+msgstr "Poort voor FTP"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:107
 msgid "Demo Plugin"
-msgstr ""
+msgstr "Demo plugin"
 
 #: simple-plugin/demoPlugin/class_demoPlugin.inc:108
 msgid "Edit some useless personal information"
@@ -128,8 +129,8 @@ msgstr ""
 
 #: debug-help/addons/debug-help/class_debugHelp.inc:55
 msgid "Object Types"
-msgstr ""
+msgstr "Object types"
 
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Onvoldoende rechten"
diff --git a/developers/locale/pl/fusiondirectory.po b/developers/locale/pl/fusiondirectory.po
index 3525c8c6e2992b3c4920158d853870c55d3d56cb..a29331d08e85f420e04e299e181267840333740a 100644
--- a/developers/locale/pl/fusiondirectory.po
+++ b/developers/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/pt/fusiondirectory.po b/developers/locale/pt/fusiondirectory.po
index d65c66e71a3e4c1007cee9a6a4baf5afdc729ca4..c8c51a4a7e45ab12a4fb72a27de5b7917cf07c9c 100644
--- a/developers/locale/pt/fusiondirectory.po
+++ b/developers/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/pt_BR/fusiondirectory.po b/developers/locale/pt_BR/fusiondirectory.po
index 5e999507a3e79c8ad81113dc60904b6e00496dd8..72179b6fde3999ba52cf50271b9b2192f8303698 100644
--- a/developers/locale/pt_BR/fusiondirectory.po
+++ b/developers/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/ru/fusiondirectory.po b/developers/locale/ru/fusiondirectory.po
index 17f4af8db907260dbd6251d850e5b62039047748..409bcaa597101a60354647fb94aa8da6f95d8d6c 100644
--- a/developers/locale/ru/fusiondirectory.po
+++ b/developers/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,4 +133,4 @@ msgstr ""
 
 #: debug-help/addons/debug-help/debughelp.tpl.c:2
 msgid "Insufficient rights"
-msgstr "Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ñ€Ð°Ð²"
+msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ñ€Ð°Ð²"
diff --git a/developers/locale/ru@petr1708/fusiondirectory.po b/developers/locale/ru@petr1708/fusiondirectory.po
index 3d40c09971cbecd3685ce8a6c4794432af2101c1..0bda2f528f6ec89a6163100ab57ea496dd0e4a0a 100644
--- a/developers/locale/ru@petr1708/fusiondirectory.po
+++ b/developers/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/sv/fusiondirectory.po b/developers/locale/sv/fusiondirectory.po
index cd09de119debe25286d27c4030e3244b5a7ac327..26224494c52d263b77ebce66f867c695e6e9a3ee 100644
--- a/developers/locale/sv/fusiondirectory.po
+++ b/developers/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/ug/fusiondirectory.po b/developers/locale/ug/fusiondirectory.po
index df12adf08be6271a40160d95d000089eacaea999..6d44c520163a9a7d22aa6602a008a0215a199ea6 100644
--- a/developers/locale/ug/fusiondirectory.po
+++ b/developers/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/vi_VN/fusiondirectory.po b/developers/locale/vi_VN/fusiondirectory.po
index 2d6e25424a04b9f4a171a9c89ec63e01a266cfc8..68a8f810074bae3c1a6e09f73362326954fd5a1e 100644
--- a/developers/locale/vi_VN/fusiondirectory.po
+++ b/developers/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/developers/locale/zh/fusiondirectory.po b/developers/locale/zh/fusiondirectory.po
index 05defd5f627674b2c36d18574bcc30f77777947f..9de00f3131b309de83e34f2bd024605d883216fd 100644
--- a/developers/locale/zh/fusiondirectory.po
+++ b/developers/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dhcp/admin/dhcp/class_dhcpConfiguration.inc b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
index 6bf336cc24bd2021e80f4e3a6022ebf24844d5fc..62359c761fd532e4f77b38dfa5379e669b1c3ea8 100644
--- a/dhcp/admin/dhcp/class_dhcpConfiguration.inc
+++ b/dhcp/admin/dhcp/class_dhcpConfiguration.inc
@@ -54,6 +54,7 @@ class DhcpSectionsAttribute extends DialogOrderedArrayAttribute
       return array('not in cache',$dn,'');
     }
 
+    //~ $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$key."'>".$value[1]."</a>";
     $link = $value[1];
 
     $objtype = $this->objectType($dn);
@@ -595,7 +596,7 @@ class dhcpConfiguration extends simplePlugin
     return TRUE;
   }
 
-  protected function ldap_save($cleanup = TRUE)
+  protected function ldap_save()
   {
     global $config;
     $this->ldap_error = 'Success';
@@ -684,13 +685,7 @@ class dhcpConfiguration extends simplePlugin
       }
     }
 
-    msg_dialog::displayChecks($errors);
-
-    return !empty($errors);
-  }
-
-  public function setPrimaryServer($dn)
-  {
-    $this->attributesAccess['dhcpSections']->setPrimaryDn($dn);
+    //~ parent::ldap_save();
+    return $errors;
   }
 }
diff --git a/dhcp/admin/dhcp/class_dhcpManagement.inc b/dhcp/admin/dhcp/class_dhcpManagement.inc
index f7c6862a8e3b1444e926e0274fb0e48464f45b00..1c40187821a0874a715b10c19713eeabdeb447f1 100644
--- a/dhcp/admin/dhcp/class_dhcpManagement.inc
+++ b/dhcp/admin/dhcp/class_dhcpManagement.inc
@@ -41,10 +41,5 @@ class dhcpManagement extends simpleManagement
       'plProvidedAcls'  => array()
     );
   }
-
-  function __construct()
-  {
-    parent::__construct();
-  }
 }
 ?>
diff --git a/dhcp/admin/dhcp/class_dhcpPlugin.inc b/dhcp/admin/dhcp/class_dhcpPlugin.inc
index f091ee980614c7c0226b7029f4d252bb952ff471..74a75e8dc52d31b8e9bfd9df4e1ad77ee3fde885 100644
--- a/dhcp/admin/dhcp/class_dhcpPlugin.inc
+++ b/dhcp/admin/dhcp/class_dhcpPlugin.inc
@@ -60,7 +60,6 @@ class dhcpPlugin extends simplePlugin
 
   function __construct ($plugin, $dn, $attrs = NULL)
   {
-    global $config;
     if (is_array($attrs)) {
       foreach ($attrs as $key => &$value) {
         if (is_array($value)) {
diff --git a/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc b/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
index 864c04ca234ce87053028449402e5a870a955382..eca313b20a987a2ed37337ebd969eb9e83a70d96 100644
--- a/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
+++ b/dhcp/admin/dhcp/class_dhcpSectionCreationDialog.inc
@@ -136,7 +136,6 @@ class DhcpSectionCreationDialog extends GenericDialog
       return $this->dialog_execute();
     }
 
-    $dn     = $this->dialog->dn;
     $data   = $this->dialog->save();
     $this->attribute->editEnded($data['dn'], $data, ($this->parentdn === FALSE ? FALSE : $this->parentdn));
     return FALSE;
diff --git a/dhcp/admin/dhcp/sections/class_dhcpClass.inc b/dhcp/admin/dhcp/sections/class_dhcpClass.inc
index 428bc481721af22bf0572366e967ebeb638d0c02..604f7b75370717af1cac9af2a4cff44cc6debaae 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpClass.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpClass.inc
@@ -21,4 +21,14 @@
 class dhcpClass extends dhcpPlugin
 {
   public $objectclasses = array('dhcpClass');
+
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP class'),
+      'plDescription'   => _('DHCP class'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
 }
diff --git a/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc b/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
index 59c9403789904e4e12bb446d40765b927641e96e..c49fd3a5e5dd4ec914193566ae70ce4737b6e006 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpDnsZone.inc
@@ -22,6 +22,16 @@ class dhcpDnsZone extends dhcpPlugin
 {
   public $objectclasses = array('dhcpDnsZone');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP DNS update zone'),
+      'plDescription'   => _('DHCP DNS update zone'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
diff --git a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
index 5268a4caa248149ffe2a5add0c31d4cbb29f7e97..71da2cdc07e0ca12a5baee2e82a7baef171580af 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpFailOverPeer.inc
@@ -22,6 +22,16 @@ class dhcpFailOverPeer extends dhcpPlugin
 {
   public $objectclasses = array('dhcpFailOverPeer');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP failover peer'),
+      'plDescription'   => _('DHCP failover peer'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
diff --git a/dhcp/admin/dhcp/sections/class_dhcpGroup.inc b/dhcp/admin/dhcp/sections/class_dhcpGroup.inc
index 8fc0976f92ae8f784e808c908ae3f1e202751b72..31168fa89b31d58b258a163b902800b23a354cf1 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpGroup.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpGroup.inc
@@ -21,4 +21,14 @@
 class dhcpGroup extends dhcpPlugin
 {
   public $objectclasses = array('dhcpGroup');
+
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP group'),
+      'plDescription'   => _('DHCP group'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
 }
diff --git a/dhcp/admin/dhcp/sections/class_dhcpHost.inc b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
index a995ae0663e3beeabd7354700c7a0beefdb04424..7ee459423a57f953f5816b45c4fa90410fc2f1b1 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpHost.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpHost.inc
@@ -22,6 +22,16 @@ class dhcpHost extends dhcpPlugin
 {
   public $objectclasses = array('dhcpHost');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP host'),
+      'plDescription'   => _('DHCP host'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     $attributesInfo = parent::getAttributesInfo();
diff --git a/dhcp/admin/dhcp/sections/class_dhcpPool.inc b/dhcp/admin/dhcp/sections/class_dhcpPool.inc
index 467eb48bf3225440539c9b76d4a20a46f1973115..eea1751919413e929be620ffd95be8e84445d7c0 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpPool.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpPool.inc
@@ -22,6 +22,16 @@ class dhcpPool extends dhcpPlugin
 {
   public $objectclasses = array('dhcpPool');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP pool'),
+      'plDescription'   => _('DHCP pool'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     $attributesInfo = parent::getAttributesInfo();
@@ -30,8 +40,10 @@ class dhcpPool extends dhcpPlugin
       'attrs' => array(
         new SetAttribute (
           new StringAttribute (
-            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.'),
-            'dhcpRange', TRUE
+            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a space; if the range only contains one address, then just the address can be specified. Each range is defined as a separate value.'),
+            'dhcpRange', TRUE,
+            '', '',
+            '/^[0-9\.:]+(\s[0-9\.:]+)?$/'
           )
         ),
         new SetAttribute (
diff --git a/dhcp/admin/dhcp/sections/class_dhcpService.inc b/dhcp/admin/dhcp/sections/class_dhcpService.inc
index e1a2141af7b63e3ec92455e7b6970aca357607d4..d3fb8f689833d716f0185546dd55a0813e1c70f0 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpService.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpService.inc
@@ -22,6 +22,16 @@ class dhcpService extends dhcpPlugin
 {
   public $objectclasses = array('dhcpService');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP service'),
+      'plDescription'   => _('DHCP service'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     $attributesInfo = parent::getAttributesInfo();
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc b/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
index 427d442cb86d6d107908f648fc01d1396d053b8c..2179957f70d6ac766b9418e5df2d193a9a22848c 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpSharedNetwork.inc
@@ -22,6 +22,16 @@ class dhcpSharedNetwork extends dhcpPlugin
 {
   public $objectclasses = array('dhcpSharedNetwork');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP shared network'),
+      'plDescription'   => _('DHCP shared network'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     $attributesInfo = parent::getAttributesInfo();
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc b/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
index 5db514339ab2a86f996afefb5579db3b871aa969..c9ee3ed4da864f9fd612e471c173fdc55b6f65c2 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpSubClass.inc
@@ -21,4 +21,14 @@
 class dhcpSubClass extends dhcpPlugin
 {
   public $objectclasses = array('dhcpSubClass');
+
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP subclass'),
+      'plDescription'   => _('DHCP subclass'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
 }
diff --git a/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc b/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
index 58e6031dda60ef2c7dfc4ac2bba58500db514547..22e504828db42f6936f2b8b59b2c236c7f8ff244 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpSubnet.inc
@@ -22,6 +22,16 @@ class dhcpSubnet extends dhcpPlugin
 {
   public $objectclasses = array('dhcpSubnet');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP subnet'),
+      'plDescription'   => _('DHCP subnet'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     $attributesInfo = parent::getAttributesInfo();
@@ -35,8 +45,10 @@ class dhcpSubnet extends dhcpPlugin
         ),
         new SetAttribute (
           new StringAttribute (
-            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen. Each range is defined as a separate value.'),
-            'dhcpRange', FALSE
+            _('Range'), _('The starting & ending IP Addresses in the range (inclusive), separated by a space; if the range only contains one address, then just the address can be specified. Each range is defined as a separate value.'),
+            'dhcpRange', FALSE,
+            '', '',
+            '/^[0-9\.:]+(\s[0-9\.:]+)?$/'
           )
         ),
       )
diff --git a/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc b/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
index 7b36e89e2e4bf43de1791f9486c14d5c55f7d666..87e0773dde9603737f480680ca61b646404a7c70 100644
--- a/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
+++ b/dhcp/admin/dhcp/sections/class_dhcpTSigKey.inc
@@ -22,6 +22,16 @@ class dhcpTSigKey extends dhcpPlugin
 {
   public $objectclasses = array('dhcpTSigKey');
 
+  public static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('DHCP DNS update key'),
+      'plDescription'   => _('DHCP DNS update key'),
+      'plCategory'      => array('dhcpConfiguration'),
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
   static function getAttributesInfo ()
   {
     return array(
diff --git a/dhcp/admin/systems/class_dhcpSystem.inc b/dhcp/admin/systems/class_dhcpSystem.inc
index d78cdde782e201cf3dc1174946f9b525304ea8c2..b6ba70259a97f4e85429aeb7d74294c6a10c1e3d 100644
--- a/dhcp/admin/systems/class_dhcpSystem.inc
+++ b/dhcp/admin/systems/class_dhcpSystem.inc
@@ -68,7 +68,6 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
         $this->plugin->is_account = !empty($this->value);
       } elseif (isset($this->plugin->attrs[$this->getLdapName()]['count'])) {
         $this->value = array();
-        // TODO $this->loadAdditionalTemplatesValues();
       }
     }
   }
@@ -127,7 +126,6 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
     if ($this->plugin->is_template) {
       return;
     }
-    /* FIXME - We should lock the object and check if we donâ€™t erase changes */
     $values   = $this->getValue();
     $iValues  = $this->getInitialValue();
     /* React to changes on main tab */
@@ -168,6 +166,7 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
     }
 
     $valueHashes    = array_flip(array_map('join', $values));
+    //~ $iValueHashes   = array_flip(array_map('join', $iValues));
     foreach ($iValues as $value) {
       $hash = join($value);
       if (isset($valueHashes[$hash]) && !$fullrewrite) {
@@ -182,7 +181,8 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       }
       $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
       $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->delHost($value[3]);
-      $dhcpTabs->save();
+      $errors = $dhcpTabs->save();
+      msg_dialog::displayChecks($errors);
     }
     foreach ($values as $value) {
       $configDn = $value[0];
@@ -193,12 +193,9 @@ class DhcpHostsAttribute extends OrderedArrayAttribute
       }
       $dhcpTabs = objects::open($configDn, 'dhcpConfiguration');
       $dhcpTabs->getBaseObject()->attributesAccess['dhcpSections']->addHost($value[0], $cn, $value[1], $value[2]);
-      $dhcpTabs->save();
+      $errors = $dhcpTabs->save();
+      msg_dialog::displayChecks($errors);
     }
-    /* TODO
-     * ? handle modification somehow (if we want to keep statements when changing IP, not sure about this)
-     * We should also look into what should be possible or not, like IP, Mac or cn duplication.
-     * */
   }
 }
 
@@ -216,7 +213,7 @@ class dhcpSystem extends simplePlugin
       'plDescription'   => _('Edit the DHCP zones of a system'),
       'plIcon'          => 'geticon.php?context=applications&icon=dhcp&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=dhcp&size=16',
-      'plObjectType'    => array('server','workstation','terminal','printer','component','winstation','phone','mobilePhone'),
+      'plObjectType'    => array('server','workstation','terminal','printer','component','phone','mobilePhone'),
       'plPriority'      => 4,
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
@@ -282,12 +279,15 @@ class dhcpSystem extends simplePlugin
     return $nodes;
   }
 
-  function ldap_save($cleanup = TRUE)
+  protected function shouldSave()
   {
-    global $config;
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
 
-    /* workaround for audit strange errors */
-    $this->ldap_error = 'Success';
+  function ldap_save()
+  {
+    global $config;
 
     $ldap = $config->get_ldap_link();
     $baseObject = $this->parent->getBaseObject();
@@ -302,4 +302,15 @@ class dhcpSystem extends simplePlugin
       array($baseObject->attributeValue('macAddress'))
     );
   }
+
+  function remove_from_parent()
+  {
+    if ($this->is_template) {
+      return parent::remove_from_parent();
+    } elseif (($this->dn != '') && ($this->dn != 'new')) {
+      /* Remove all records */
+      $this->attributesAccess['dhcpHosts']->setValue(array());
+      return $this->ldap_save();
+    }
+  }
 }
diff --git a/dhcp/contrib/openldap/dhcp-fd.schema b/dhcp/contrib/openldap/dhcp-fd.schema
index 86b823c9b96864fd53ec7573ceb667d1a3376d17..1c55493397f4ac937cbcec5eb2feb2654bf7ef86 100644
--- a/dhcp/contrib/openldap/dhcp-fd.schema
+++ b/dhcp/contrib/openldap/dhcp-fd.schema
@@ -1,462 +1,462 @@
-attributetype ( 2.16.840.1.38414.1.203.4.1 
-  NAME 'dhcpPrimaryDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.1
+  NAME 'dhcpPrimaryDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The DN of the dhcpServer which is the primary server for the configuration.' 
+  DESC 'The DN of the dhcpServer which is the primary server for the configuration.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.2 
-  NAME 'dhcpSecondaryDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.2
+  NAME 'dhcpSecondaryDN'
   EQUALITY distinguishedNameMatch
   DESC 'The DN of dhcpServer(s) which provide backup service for the configuration.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.3 
-  NAME 'dhcpStatements' 
+attributetype ( 2.16.840.1.38414.1.203.4.3
+  NAME 'dhcpStatements'
   EQUALITY caseIgnoreIA5Match
-  DESC 'Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.' 
+  DESC 'Flexible storage for specific data depending on what object this exists in. Like conditional statements, server parameters, etc. This allows the standard to evolve without needing to adjust the schema.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.4 
-  NAME 'dhcpRange' 
+attributetype ( 2.16.840.1.38414.1.203.4.4
+  NAME 'dhcpRange'
   EQUALITY caseIgnoreIA5Match
-  DESC 'The starting & ending IP Addresses in the range (inclusive), separated by a hyphen; if the range only contains one address, then just the address can be specified with no hyphen.  Each range is defined as a separate value.'
+  DESC 'The starting & ending IP Addresses in the range (inclusive), separated by a space; if the range only contains one address, then just the address can be specified.  Each range is defined as a separate value.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.5 
-  NAME 'dhcpPermitList' 
+attributetype ( 2.16.840.1.38414.1.203.4.5
+  NAME 'dhcpPermitList'
   EQUALITY caseIgnoreIA5Match
-  DESC 'This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.' 
+  DESC 'This attribute contains the permit lists associated with a pool. Each permit list is defined as a separate value.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.6 
-  NAME 'dhcpNetMask' 
+attributetype ( 2.16.840.1.38414.1.203.4.6
+  NAME 'dhcpNetMask'
   EQUALITY integerMatch
-  DESC 'The subnet mask length for the subnet.  The mask can be easily computed from this length.' 
+  DESC 'The subnet mask length for the subnet.  The mask can be easily computed from this length.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.7 
-  NAME 'dhcpOption' 
+attributetype ( 2.16.840.1.38414.1.203.4.7
+  NAME 'dhcpOption'
   EQUALITY caseIgnoreIA5Match
-  DESC 'Encoded option values to be sent to clients.  Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.' 
+  DESC 'Encoded option values to be sent to clients.  Each value represents a single option and contains (OptionTag, Length, OptionValue) encoded in the format used by DHCP.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.8 
-  NAME 'dhcpClassData' 
+attributetype ( 2.16.840.1.38414.1.203.4.8
+  NAME 'dhcpClassData'
   EQUALITY caseIgnoreIA5Match
-  DESC 'Encoded text string or list of bytes expressed in hexadecimal, separated by colons.  Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.' 
+  DESC 'Encoded text string or list of bytes expressed in hexadecimal, separated by colons.  Clients match subclasses based on matching the class data with the results of match or spawn with statements in the class name declarations.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.9 
-  NAME 'dhcpOptionsDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.9
+  NAME 'dhcpOptionsDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.' 
+  DESC 'The distinguished name(s) of the dhcpOption objects containing the configuration options provided by the server.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.10 
-  NAME 'dhcpHostDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.10
+  NAME 'dhcpHostDN'
   EQUALITY distinguishedNameMatch
-  DESC 'the distinguished name(s) of the dhcpHost objects.' 
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
+  DESC 'the distinguished name(s) of the dhcpHost objects.'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.11 
-  NAME 'dhcpPoolDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.11
+  NAME 'dhcpPoolDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of pools.' 
+  DESC 'The distinguished name(s) of pools.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.12 
-  NAME 'dhcpGroupDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.12
+  NAME 'dhcpGroupDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s)   of the groups.' 
+  DESC 'The distinguished name(s)   of the groups.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.13 
-  NAME 'dhcpSubnetDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.13
+  NAME 'dhcpSubnetDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of the subnets.' 
+  DESC 'The distinguished name(s) of the subnets.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.14 
-  NAME 'dhcpLeaseDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.14
+  NAME 'dhcpLeaseDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name of a client address.' 
+  DESC 'The distinguished name of a client address.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE)
 
-attributetype ( 2.16.840.1.38414.1.203.4.15 
-  NAME 'dhcpLeasesDN' 
-  DESC 'The distinguished name(s) client addresses.' 
+attributetype ( 2.16.840.1.38414.1.203.4.15
+  NAME 'dhcpLeasesDN'
+  DESC 'The distinguished name(s) client addresses.'
   EQUALITY distinguishedNameMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.16 
-  NAME 'dhcpClassesDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.16
+  NAME 'dhcpClassesDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of a class(es) in a subclass.' 
+  DESC 'The distinguished name(s) of a class(es) in a subclass.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.17 
-  NAME 'dhcpSubclassesDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.17
+  NAME 'dhcpSubclassesDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of subclass(es).' 
+  DESC 'The distinguished name(s) of subclass(es).'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.18 
-  NAME 'dhcpSharedNetworkDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.18
+  NAME 'dhcpSharedNetworkDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The distinguished name(s) of sharedNetworks.' 
+  DESC 'The distinguished name(s) of sharedNetworks.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.19 
-  NAME 'dhcpServiceDN' 
+attributetype ( 2.16.840.1.38414.1.203.4.19
+  NAME 'dhcpServiceDN'
   EQUALITY distinguishedNameMatch
-  DESC 'The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.' 
+  DESC 'The DN of dhcpService object(s)which contain the configuration information. Each dhcpServer object has this attribute identifying the DHCP configuration(s) that the server is associated with.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype ( 2.16.840.1.38414.1.203.4.20 
+attributetype ( 2.16.840.1.38414.1.203.4.20
   NAME 'dhcpVersion'
   DESC 'The version attribute of this object.'
   EQUALITY caseIgnoreIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.21 
-  NAME 'dhcpImplementation' 
+attributetype ( 2.16.840.1.38414.1.203.4.21
+  NAME 'dhcpImplementation'
   EQUALITY caseIgnoreIA5Match
-  DESC 'Description of the DHCP Server implementation e.g. DHCP Servers vendor.' 
+  DESC 'Description of the DHCP Server implementation e.g. DHCP Servers vendor.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.22 
-  NAME 'dhcpAddressState' 
+attributetype ( 2.16.840.1.38414.1.203.4.22
+  NAME 'dhcpAddressState'
   EQUALITY caseIgnoreIA5Match
   DESC 'This stores information about the current binding-status of an address.  For dynamic addresses managed by DHCP, the values should be restricted to the following: "FREE", "ACTIVE", "EXPIRED", "RELEASED", "RESET", "ABANDONED", "BACKUP".  For other addresses, it SHOULD be one of the following: "UNKNOWN", "RESERVED" (an address that is managed by DHCP that is reserved for a specific client), "RESERVED-ACTIVE" (same as reserved, but address is currently in use), "ASSIGNED" (assigned manually or by some other mechanism), "UNASSIGNED", "NOTASSIGNABLE".'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.23 
-  NAME 'dhcpExpirationTime' 
-  EQUALITY generalizedTimeMatch 
-  DESC 'This is the time the current lease for an address expires.' 
+attributetype ( 2.16.840.1.38414.1.203.4.23
+  NAME 'dhcpExpirationTime'
+  EQUALITY generalizedTimeMatch
+  DESC 'This is the time the current lease for an address expires.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.24 
-  NAME 'dhcpStartTimeOfState' 
-  EQUALITY generalizedTimeMatch 
-  DESC 'This is the time of the last state change for a leased address.' 
+attributetype ( 2.16.840.1.38414.1.203.4.24
+  NAME 'dhcpStartTimeOfState'
+  EQUALITY generalizedTimeMatch
+  DESC 'This is the time of the last state change for a leased address.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.25 
-  NAME 'dhcpLastTransactionTime' 
-  EQUALITY generalizedTimeMatch 
+attributetype ( 2.16.840.1.38414.1.203.4.25
+  NAME 'dhcpLastTransactionTime'
+  EQUALITY generalizedTimeMatch
   DESC 'This is the last time a valid DHCP packet was received from the client.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.26 
-  NAME 'dhcpBootpFlag' 
-  EQUALITY booleanMatch 
-  DESC 'This indicates whether the address was assigned via BOOTP.' 
+attributetype ( 2.16.840.1.38414.1.203.4.26
+  NAME 'dhcpBootpFlag'
+  EQUALITY booleanMatch
+  DESC 'This indicates whether the address was assigned via BOOTP.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.27 
-  NAME 'dhcpDomainName' 
+attributetype ( 2.16.840.1.38414.1.203.4.27
+  NAME 'dhcpDomainName'
   EQUALITY caseIgnoreIA5Match
-  DESC 'This is the name of the domain sent to the client by the server.  It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN.  To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".' 
+  DESC 'This is the name of the domain sent to the client by the server.  It is essentially the same as the value for DHCP option 15 sent to the client, and represents only the domain - not the full FQDN.  To obtain the full FQDN assigned to the client you must prepend the "dhcpAssignedHostName" to this value with a ".".'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.28 
-  NAME 'dhcpDnsStatus' 
+attributetype ( 2.16.840.1.38414.1.203.4.28
+  NAME 'dhcpDnsStatus'
   EQUALITY integerMatch
   DESC 'This indicates the status of updating DNS resource records on behalf of the client by the DHCP server for this address.  The value is a 16-bit bitmask.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.29 
-  NAME 'dhcpRequestedHostName' 
+attributetype ( 2.16.840.1.38414.1.203.4.29
+  NAME 'dhcpRequestedHostName'
   EQUALITY caseIgnoreIA5Match
-  DESC 'This is the hostname that was requested by the client.' 
+  DESC 'This is the hostname that was requested by the client.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.30 
-  NAME 'dhcpAssignedHostName' 
+attributetype ( 2.16.840.1.38414.1.203.4.30
+  NAME 'dhcpAssignedHostName'
   EQUALITY caseIgnoreIA5Match
-  DESC 'This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client.  The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.' 
+  DESC 'This is the actual hostname that was assigned to a client. It may not be the name that was requested by the client.  The fully qualified domain name can be determined by appending the value of "dhcpDomainName" (with a dot separator) to this name.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.31 
-  NAME 'dhcpReservedForClient' 
+attributetype ( 2.16.840.1.38414.1.203.4.31
+  NAME 'dhcpReservedForClient'
   EQUALITY distinguishedNameMatch
   DESC 'The distinguished name of a "dhcpClient" that an address is reserved for.  This may not be the same as the "dhcpAssignedToClient" attribute if the address is being reassigned but the current lease has not yet expired.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.32 
-  NAME 'dhcpAssignedToClient' 
+attributetype ( 2.16.840.1.38414.1.203.4.32
+  NAME 'dhcpAssignedToClient'
   EQUALITY distinguishedNameMatch
-  DESC 'This is the distinguished name of a "dhcpClient" that an address is currently assigned to.  This attribute is only present in the class when the address is leased.' 
+  DESC 'This is the distinguished name of a "dhcpClient" that an address is currently assigned to.  This attribute is only present in the class when the address is leased.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.33 
-  NAME 'dhcpRelayAgentInfo' 
+attributetype ( 2.16.840.1.38414.1.203.4.33
+  NAME 'dhcpRelayAgentInfo'
   EQUALITY octetStringMatch
-  DESC 'If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request.  This is a hex-encoded option value.' 
+  DESC 'If the client request was received via a relay agent, this contains information about the relay agent that was available from the DHCP request.  This is a hex-encoded option value.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.34 
-  NAME 'dhcpHWAddress' 
+attributetype ( 2.16.840.1.38414.1.203.4.34
+  NAME 'dhcpHWAddress'
   EQUALITY caseIgnoreIA5Match
-  DESC 'The clients hardware address that requested this IP address.' 
+  DESC 'The clients hardware address that requested this IP address.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.35 
-  NAME 'dhcpHashBucketAssignment' 
+attributetype ( 2.16.840.1.38414.1.203.4.35
+  NAME 'dhcpHashBucketAssignment'
   EQUALITY octetStringMatch
-  DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].' 
+  DESC 'HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load Balancing Algorithm [RFC 3074].'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.36 
-  NAME 'dhcpDelayedServiceParameter' 
+attributetype ( 2.16.840.1.38414.1.203.4.36
+  NAME 'dhcpDelayedServiceParameter'
   EQUALITY integerMatch
   DESC 'Delay in seconds corresponding to Delayed Service Parameter configuration, as defined in  DHC Load Balancing Algorithm [RFC 3074]. '
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.37 
-  NAME 'dhcpMaxClientLeadTime' 
+attributetype ( 2.16.840.1.38414.1.203.4.37
+  NAME 'dhcpMaxClientLeadTime'
   EQUALITY integerMatch
-  DESC 'Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]' 
+  DESC 'Maximum Client Lead Time configuration in seconds, as defined in DHCP Failover Protocol [FAILOVR]'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.38 
-  NAME 'dhcpFailOverEndpointState' 
+attributetype ( 2.16.840.1.38414.1.203.4.38
+  NAME 'dhcpFailOverEndpointState'
   EQUALITY caseIgnoreIA5Match
-  DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]' 
+  DESC 'Server (Failover Endpoint) state, as defined in DHCP Failover Protocol [FAILOVR]'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.39 
-  NAME 'dhcpErrorLog' 
+attributetype ( 2.16.840.1.38414.1.203.4.39
+  NAME 'dhcpErrorLog'
   EQUALITY caseIgnoreIA5Match
   DESC 'Generic error log attribute that allows logging error conditions within a dhcpService or a dhcpSubnet, like no IP addresses available for lease.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.40 
-  NAME 'dhcpLocatorDN' 
-  EQUALITY distinguishedNameMatch 
-  DESC 'The DN of dhcpLocator object which contain the DNs of all DHCP configuration objects. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
+attributetype ( 2.16.840.1.38414.1.203.4.40
+  NAME 'dhcpLocatorDN'
+  EQUALITY distinguishedNameMatch
+  DESC 'The DN of dhcpLocator object which contain the DNs of all DHCP configuration objects. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
-attributetype  ( 2.16.840.1.38414.1.203.4.41 
-  NAME 'dhcpKeyAlgorithm' 
-  EQUALITY caseIgnoreIA5Match 
-  DESC 'Algorithm to generate TSIG Key' 
+attributetype  ( 2.16.840.1.38414.1.203.4.41
+  NAME 'dhcpKeyAlgorithm'
+  EQUALITY caseIgnoreIA5Match
+  DESC 'Algorithm to generate TSIG Key'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype  ( 2.16.840.1.38414.1.203.4.42 
-  NAME 'dhcpKeySecret' 
-  EQUALITY octetStringMatch 
+attributetype  ( 2.16.840.1.38414.1.203.4.42
+  NAME 'dhcpKeySecret'
+  EQUALITY octetStringMatch
   DESC 'Secret to generate TSIG Key' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.43 
-  NAME 'dhcpDnsZoneServer' 
-  EQUALITY caseIgnoreIA5Match 
-  DESC 'Master server of the DNS Zone' 
+attributetype ( 2.16.840.1.38414.1.203.4.43
+  NAME 'dhcpDnsZoneServer'
+  EQUALITY caseIgnoreIA5Match
+  DESC 'Master server of the DNS Zone'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 2.16.840.1.38414.1.203.4.44 
-  NAME 'dhcpKeyDN' 
-  EQUALITY distinguishedNameMatch 
-  DESC 'The DNs of TSIG Key to use in secure dynamic updates. In case of locator object, this will be list of TSIG keys.  In case of DHCP Service, Shared Network, Subnet and DNS Zone, it will be a single key.' 
+attributetype ( 2.16.840.1.38414.1.203.4.44
+  NAME 'dhcpKeyDN'
+  EQUALITY distinguishedNameMatch
+  DESC 'The DNs of TSIG Key to use in secure dynamic updates. In case of locator object, this will be list of TSIG keys.  In case of DHCP Service, Shared Network, Subnet and DNS Zone, it will be a single key.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
 
-attributetype ( 2.16.840.1.38414.1.203.4.45 
-  NAME 'dhcpZoneDN' 
-  EQUALITY distinguishedNameMatch 
-  DESC 'The DNs of DNS Zone. In case of locator object, this will be list of DNS Zones in the tree. In case of DHCP Service, Shared Network and Subnet, it will be a single DNS Zone.' 
+attributetype ( 2.16.840.1.38414.1.203.4.45
+  NAME 'dhcpZoneDN'
+  EQUALITY distinguishedNameMatch
+  DESC 'The DNs of DNS Zone. In case of locator object, this will be list of DNS Zones in the tree. In case of DHCP Service, Shared Network and Subnet, it will be a single DNS Zone.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
 
-attributetype ( 2.16.840.1.38414.1.203.4.46 
-  NAME 'dhcpFailOverPrimaryServer' 
-  EQUALITY caseIgnoreIA5Match 
-  DESC 'IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over.' 
+attributetype ( 2.16.840.1.38414.1.203.4.46
+  NAME 'dhcpFailOverPrimaryServer'
+  EQUALITY caseIgnoreIA5Match
+  DESC 'IP address or DNS name of the server playing primary role in DHC Load Balancing and Fail over.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
 
-attributetype ( 2.16.840.1.38414.1.203.4.47 
-  NAME 'dhcpFailOverSecondaryServer' 
-  EQUALITY caseIgnoreIA5Match 
-  DESC 'IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over.' 
+attributetype ( 2.16.840.1.38414.1.203.4.47
+  NAME 'dhcpFailOverSecondaryServer'
+  EQUALITY caseIgnoreIA5Match
+  DESC 'IP address or DNS name of the server playing secondary role in DHC Load Balancing and Fail over.'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.48
-  NAME 'dhcpFailOverPrimaryPort' 
-  EQUALITY integerMatch 
-  DESC 'Port on which primary server listens for connections from its fail over peer (secondary server)' 
+  NAME 'dhcpFailOverPrimaryPort'
+  EQUALITY integerMatch
+  DESC 'Port on which primary server listens for connections from its fail over peer (secondary server)'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
-  
+
 attributetype ( 2.16.840.1.38414.1.203.4.49
-  NAME 'dhcpFailOverSecondaryPort' 
-  EQUALITY integerMatch 
-  DESC 'Port on which secondary server listens for connections from its fail over peer (primary server)' 
+  NAME 'dhcpFailOverSecondaryPort'
+  EQUALITY integerMatch
+  DESC 'Port on which secondary server listens for connections from its fail over peer (primary server)'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.50
-  NAME 'dhcpFailOverResponseDelay' 
-  EQUALITY integerMatch 
-  DESC 'Maximum response time in seconds, before Server assumes that connection to fail over peer has failed' 
+  NAME 'dhcpFailOverResponseDelay'
+  EQUALITY integerMatch
+  DESC 'Maximum response time in seconds, before Server assumes that connection to fail over peer has failed'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.51
-  NAME 'dhcpFailOverUnackedUpdates' 
-  EQUALITY integerMatch 
-  DESC 'Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer' 
+  NAME 'dhcpFailOverUnackedUpdates'
+  EQUALITY integerMatch
+  DESC 'Number of BNDUPD messages that server can send before it receives BNDACK from its fail over peer'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.52
-  NAME 'dhcpFailOverSplit' 
-  EQUALITY integerMatch 
-  DESC 'Split between the primary and secondary servers for fail over purpose' 
+  NAME 'dhcpFailOverSplit'
+  EQUALITY integerMatch
+  DESC 'Split between the primary and secondary servers for fail over purpose'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.53
-  NAME 'dhcpFailOverLoadBalanceTime' 
-  EQUALITY integerMatch 
-  DESC 'Cutoff time in seconds, after which load balance is disabled' 
+  NAME 'dhcpFailOverLoadBalanceTime'
+  EQUALITY integerMatch
+  DESC 'Cutoff time in seconds, after which load balance is disabled'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27  )
 
 attributetype ( 2.16.840.1.38414.1.203.4.54
-  NAME 'dhcpFailOverPeerDN' 
-  EQUALITY distinguishedNameMatch 
-  DESC 'The DNs of Fail over peers. In case of locator object, this will be list of fail over peers in the tree. In case of Subnet and pool, it will be a single Fail Over Peer' 
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 ) 
+  NAME 'dhcpFailOverPeerDN'
+  EQUALITY distinguishedNameMatch
+  DESC 'The DNs of Fail over peers. In case of locator object, this will be list of fail over peers in the tree. In case of Subnet and pool, it will be a single Fail Over Peer'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
 #List of all servers in the tree
 attributetype ( 2.16.840.1.38414.1.203.4.55
-  NAME 'dhcpServerDN' 
-  EQUALITY distinguishedNameMatch 
-  DESC 'List of all  DHCP Servers in the tree. Used by dhcpLocatorObject' 
+  NAME 'dhcpServerDN'
+  EQUALITY distinguishedNameMatch
+  DESC 'List of all  DHCP Servers in the tree. Used by dhcpLocatorObject'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
 
 attributetype ( 2.16.840.1.38414.1.203.4.56
-  NAME 'dhcpComments' 
-  EQUALITY caseIgnoreIA5Match 
-  DESC 'Generic attribute that allows coments  within any DHCP object' 
+  NAME 'dhcpComments'
+  EQUALITY caseIgnoreIA5Match
+  DESC 'Generic attribute that allows coments  within any DHCP object'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # Classes
 
-objectclass ( 2.16.840.1.38414.1.203.6.1 
-  NAME 'dhcpService' 
-  DESC 'Service object that represents the actual DHCP Service configuration. This is a container object.' 
-  SUP top 
-  MUST (cn) 
+objectclass ( 2.16.840.1.38414.1.203.6.1
+  NAME 'dhcpService'
+  DESC 'Service object that represents the actual DHCP Service configuration. This is a container object.'
+  SUP top
+  MUST (cn)
   MAY ( dhcpPrimaryDN $ dhcpSecondaryDN $ dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $dhcpComments $ dhcpOption) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.2 
-  NAME 'dhcpSharedNetwork' 
-  DESC 'This stores configuration information for a shared network.' 
-  SUP top 
-  MUST cn 
+objectclass ( 2.16.840.1.38414.1.203.6.2
+  NAME 'dhcpSharedNetwork'
+  DESC 'This stores configuration information for a shared network.'
+  SUP top
+  MUST cn
   MAY ( dhcpSubnetDN $ dhcpPoolDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpStatements $dhcpComments $ dhcpOption) X-NDS_CONTAINMENT ('dhcpService' ) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.3 
-  NAME 'dhcpSubnet' 
-  DESC 'This class defines a subnet. This is a container object.' 
-  SUP top 
-  MUST ( cn $ dhcpNetMask ) 
+objectclass ( 2.16.840.1.38414.1.203.6.3
+  NAME 'dhcpSubnet'
+  DESC 'This class defines a subnet. This is a container object.'
+  SUP top
+  MUST ( cn $ dhcpNetMask )
   MAY ( dhcpRange $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $ dhcpClassesDN $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $ dhcpKeyDN $ dhcpFailOverPeerDN $ dhcpStatements $ dhcpComments $ dhcpOption ) X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.4 
-  NAME 'dhcpPool' 
-  DESC 'This stores configuration information about a pool.' 
-  SUP top 
-  MUST ( cn $ dhcpRange ) 
-  MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption ) 
+objectclass ( 2.16.840.1.38414.1.203.6.4
+  NAME 'dhcpPool'
+  DESC 'This stores configuration information about a pool.'
+  SUP top
+  MUST ( cn $ dhcpRange )
+  MAY ( dhcpClassesDN $ dhcpPermitList $ dhcpLeasesDN $ dhcpOptionsDN $ dhcpZoneDN $dhcpKeyDN $ dhcpStatements $ dhcpComments $ dhcpOption )
   X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpSharedNetwork') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.5 
-  NAME 'dhcpGroup' 
-  DESC 'Group object that lists host DNs and parameters. This is a container object.' 
-  SUP top 
-  MUST cn 
+objectclass ( 2.16.840.1.38414.1.203.6.5
+  NAME 'dhcpGroup'
+  DESC 'Group object that lists host DNs and parameters. This is a container object.'
+  SUP top
+  MUST cn
   MAY ( dhcpHostDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption )
   X-NDS_CONTAINMENT ('dhcpSubnet' 'dhcpService' ) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.6 
-  NAME 'dhcpHost' 
-  DESC 'This represents information about a particular client' 
-  SUP top 
-  MUST cn 
-  MAY  (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
+objectclass ( 2.16.840.1.38414.1.203.6.6
+  NAME 'dhcpHost'
+  DESC 'This represents information about a particular client'
+  SUP top
+  MUST cn
+  MAY  (dhcpLeaseDN $ dhcpHWAddress $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption)
   X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' 'dhcpGroup') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.7 
-  NAME 'dhcpClass' 
-  DESC 'Represents information about a collection of related clients.' 
-  SUP top 
-  MUST cn 
-  MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) 
+objectclass ( 2.16.840.1.38414.1.203.6.7
+  NAME 'dhcpClass'
+  DESC 'Represents information about a collection of related clients.'
+  SUP top
+  MUST cn
+  MAY (dhcpSubClassesDN $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption)
   X-NDS_CONTAINMENT ('dhcpService' 'dhcpSubnet' ) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.8 
-  NAME 'dhcpSubClass' 
-  DESC 'Represents information about a collection of related classes.' 
-  SUP top 
-  MUST cn 
+objectclass ( 2.16.840.1.38414.1.203.6.8
+  NAME 'dhcpSubClass'
+  DESC 'Represents information about a collection of related classes.'
+  SUP top
+  MUST cn
   MAY (dhcpClassData $ dhcpOptionsDN $ dhcpStatements $ dhcpComments $ dhcpOption) X-NDS_CONTAINMENT 'dhcpClass' )
 
-objectclass ( 2.16.840.1.38414.1.203.6.9 
-  NAME 'dhcpOptions' 
-  DESC 'Represents information about a collection of options defined.' 
+objectclass ( 2.16.840.1.38414.1.203.6.9
+  NAME 'dhcpOptions'
+  DESC 'Represents information about a collection of options defined.'
   SUP top AUXILIARY
-  MUST cn 
-  MAY ( dhcpOption $ dhcpComments ) 
+  MUST cn
+  MAY ( dhcpOption $ dhcpComments )
   X-NDS_CONTAINMENT  ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet' 'dhcpPool' 'dhcpGroup' 'dhcpHost' 'dhcpClass' ) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.10 
-  NAME 'dhcpLeases' 
-  DESC 'This class represents an IP Address, which may or may not have been leased.' 
-  SUP top 
-  MUST ( cn $ dhcpAddressState ) 
-  MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress ) 
+objectclass ( 2.16.840.1.38414.1.203.6.10
+  NAME 'dhcpLeases'
+  DESC 'This class represents an IP Address, which may or may not have been leased.'
+  SUP top
+  MUST ( cn $ dhcpAddressState )
+  MAY ( dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress )
   X-NDS_CONTAINMENT ( 'dhcpService' 'dhcpSubnet' 'dhcpPool') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.11 
-  NAME 'dhcpLog' 
-  DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.' 
-  SUP top 
-  MUST ( cn ) 
-  MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog) 
+objectclass ( 2.16.840.1.38414.1.203.6.11
+  NAME 'dhcpLog'
+  DESC 'This is the object that holds past information about the IP address. The cn is the time/date stamp when the address was assigned or released, the address state at the time, if the address was assigned or released.'
+  SUP top
+  MUST ( cn )
+  MAY ( dhcpAddressState $ dhcpExpirationTime $ dhcpStartTimeOfState $ dhcpLastTransactionTime $ dhcpBootpFlag $ dhcpDomainName $ dhcpDnsStatus $ dhcpRequestedHostName $ dhcpAssignedHostName $ dhcpReservedForClient $ dhcpAssignedToClient $ dhcpRelayAgentInfo $ dhcpHWAddress $ dhcpErrorLog)
   X-NDS_CONTAINMENT ('dhcpLeases' 'dhcpPool' 'dhcpSubnet' 'dhcpSharedNetwork' 'dhcpService' ) )
 
-objectclass ( 2.16.840.1.38414.1.203.6.12 
-  NAME 'dhcpServer' 
-  DESC 'DHCP Server Object' 
-  SUP top AUXILIARY 
-  MUST ( cn ) 
-  MAY (dhcpServiceDN  $ dhcpLocatorDN $ dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $ dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState $ dhcpStatements $ dhcpComments $ dhcpOption) 
+objectclass ( 2.16.840.1.38414.1.203.6.12
+  NAME 'dhcpServer'
+  DESC 'DHCP Server Object'
+  SUP top AUXILIARY
+  MUST ( cn )
+  MAY (dhcpServiceDN  $ dhcpLocatorDN $ dhcpVersion $ dhcpImplementation $ dhcpHashBucketAssignment $ dhcpDelayedServiceParameter $ dhcpMaxClientLeadTime $ dhcpFailOverEndpointState $ dhcpStatements $ dhcpComments $ dhcpOption)
   X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.13 
-  NAME 'dhcpTSigKey' 
-  DESC 'TSIG key for secure dynamic updates' 
-  SUP top 
-  MUST (cn $ dhcpKeyAlgorithm $ dhcpKeySecret ) 
-  MAY ( dhcpComments ) 
+objectclass ( 2.16.840.1.38414.1.203.6.13
+  NAME 'dhcpTSigKey'
+  DESC 'TSIG key for secure dynamic updates'
+  SUP top
+  MUST (cn $ dhcpKeyAlgorithm $ dhcpKeySecret )
+  MAY ( dhcpComments )
   X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.14 
-  NAME 'dhcpDnsZone' 
-  DESC 'DNS Zone for updating leases' 
-  SUP top 
-  MUST (cn $ dhcpDnsZoneServer ) 
-  MAY (dhcpKeyDN $ dhcpComments) 
+objectclass ( 2.16.840.1.38414.1.203.6.14
+  NAME 'dhcpDnsZone'
+  DESC 'DNS Zone for updating leases'
+  SUP top
+  MUST (cn $ dhcpDnsZoneServer )
+  MAY (dhcpKeyDN $ dhcpComments)
   X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.15 
-  NAME 'dhcpFailOverPeer' 
-  DESC 'This class defines the Fail over peer' 
-  SUP top 
-  MUST ( cn $ dhcpFailOverPrimaryServer $ dhcpFailOverSecondaryServer $ dhcpFailoverPrimaryPort $ dhcpFailOverSecondaryPort) MAY (dhcpFailOverResponseDelay  $ dhcpFailOverUnackedUpdates $ dhcpMaxClientLeadTime $ dhcpFailOverSplit $ dhcpHashBucketAssignment $ dhcpFailOverLoadBalanceTime $ dhcpComments ) 
+objectclass ( 2.16.840.1.38414.1.203.6.15
+  NAME 'dhcpFailOverPeer'
+  DESC 'This class defines the Fail over peer'
+  SUP top
+  MUST ( cn $ dhcpFailOverPrimaryServer $ dhcpFailOverSecondaryServer $ dhcpFailoverPrimaryPort $ dhcpFailOverSecondaryPort) MAY (dhcpFailOverResponseDelay  $ dhcpFailOverUnackedUpdates $ dhcpMaxClientLeadTime $ dhcpFailOverSplit $ dhcpHashBucketAssignment $ dhcpFailOverLoadBalanceTime $ dhcpComments )
   X-NDS_CONTAINMENT ('dhcpService' 'dhcpSharedNetwork' 'dhcpSubnet') )
 
-objectclass ( 2.16.840.1.38414.1.203.6.16 
-  NAME 'dhcpLocator' 
-  DESC 'Locator object for DHCP configuration in the tree. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree' 
-  SUP top 
-  MUST ( cn ) 
-  MAY ( dhcpServiceDN $dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpKeyDN $ dhcpZoneDN $ dhcpFailOverPeerDN $ dhcpOption $ dhcpComments) 
+objectclass ( 2.16.840.1.38414.1.203.6.16
+  NAME 'dhcpLocator'
+  DESC 'Locator object for DHCP configuration in the tree. There will be a single dhcpLocator object in the tree with links to all the DHCP objects in the tree'
+  SUP top
+  MUST ( cn )
+  MAY ( dhcpServiceDN $dhcpServerDN $ dhcpSharedNetworkDN $ dhcpSubnetDN $ dhcpPoolDN $ dhcpGroupDN $ dhcpHostDN $  dhcpClassesDN $ dhcpKeyDN $ dhcpZoneDN $ dhcpFailOverPeerDN $ dhcpOption $ dhcpComments)
   X-NDS_CONTAINMENT ('organization' 'organizationalunit' 'domain') )
 
 
diff --git a/dhcp/locale/ar/fusiondirectory.po b/dhcp/locale/ar/fusiondirectory.po
index fc7826adfc534829fb3ebe032862ba2ff1c603d5..de0436996f4edea84f3e327a085d06238c82f9dc 100644
--- a/dhcp/locale/ar/fusiondirectory.po
+++ b/dhcp/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø©"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ca/fusiondirectory.po b/dhcp/locale/ca/fusiondirectory.po
index 59a3ade316a8932a6e7066a29f7f7df414005c3f..61b47d6b8e02d532b44c1c5862137427ee8ba141 100644
--- a/dhcp/locale/ca/fusiondirectory.po
+++ b/dhcp/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/cs_CZ/fusiondirectory.po b/dhcp/locale/cs_CZ/fusiondirectory.po
index 120f78478d9ba2e18c3fdd4a6c7496939a6e142f..3c43c22393f20bc9f13e173cc33ceddb56773af9 100644
--- a/dhcp/locale/cs_CZ/fusiondirectory.po
+++ b/dhcp/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "NastavenÃ DHCP"
 
@@ -42,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -73,94 +73,95 @@ msgstr "Sbalit DHCP podsÃÅ¥"
 msgid "Fold"
 msgstr "Sbalit"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
-msgstr "VloÅ¾it novou DHCP sekci"
+msgstr "vloÅ¾it novou DHCP sekci"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
-msgstr "CelkovÃ© pÅ™edvolby"
+msgstr "globÃ¡lnÃ volby"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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Å¯."
+msgstr ""
+"NastavenÃ DHCP jsou neznÃ¡mÃ¡. Kontaktujte prosÃm svÃ©ho sprÃ¡vce systÃ©mÅ¯."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr "DHCP sekce, obsluhovanÃ¡ tÃmto serverem"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
-msgstr "ProtokolovÃ¡nÃ"
+msgstr "poÅ™izovÃ¡nÃ protokolovacÃch zÃ¡znamÅ¯ (logÅ¯)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
-msgstr "TÅ™Ãda"
+msgstr "tÅ™Ãda"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
-msgstr "PodtÅ™Ãda"
+msgstr "podtÅ™Ãda"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
-msgstr "PoÄÃtaÄ"
+msgstr "stroj"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "skupina"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "rozsah"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
-msgstr "PodsÃÅ¥"
+msgstr "podsÃÅ¥"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
-msgstr "ProtÄ›jÅ¡ek, kterÃ½ pÅ™evezme sluÅ¾by v pÅ™ÃpadÄ› selhÃ¡nÃ"
+msgstr "zÃ¡loÅ¾nÃ server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
-msgstr "SdÃlenÃ¡ sÃÅ¥"
+msgstr "sdÃlenÃ¡ sÃÅ¥"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "klÃÄ pro aktualizaci DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "zÃ³ny aktualizace DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -181,22 +182,22 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Section"
-msgstr "Sekce"
+msgstr "sekce"
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Choose section type to create"
@@ -206,213 +207,270 @@ msgstr "Zvolte typ sekce, kterÃ¡ mÃ¡ bÃ½t vytvoÅ™ena"
 msgid "Create new DHCP section"
 msgstr "VytvoÅ™it novou sekci DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "Algoritmus"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "AdresnÃ rozsah"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "SÃÅ¥ovÃ¡ adresa"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "sluÅ¾ba DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "FyzickÃ¡ adresa zaÅ™ÃzenÃ (MAC)"
 
@@ -425,22 +483,17 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "SluÅ¾ba DHCP"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
-msgstr "Spustit sluÅ¾bu"
+msgstr "spustit sluÅ¾bu"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:57
 msgid "Stop service"
-msgstr "Zastavit sluÅ¾bu"
+msgstr "zastavit sluÅ¾bu"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:59
 msgid "Restart service"
-msgstr "Restartovat sluÅ¾bu"
+msgstr "restartovat sluÅ¾bu"
 
 #: admin/systems/class_dhcpSystem.inc:29
 msgid ""
@@ -455,14 +508,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/de/fusiondirectory.po b/dhcp/locale/de/fusiondirectory.po
index 7bedc40767577657e1b5c6771ced15c19e08f7da..1f08e16923706c8d4969e98f2a208e9b59058693 100644
--- a/dhcp/locale/de/fusiondirectory.po
+++ b/dhcp/locale/de/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:47+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
@@ -43,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -74,94 +73,96 @@ msgstr "DHCP Subnetz verwerfen"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "FÃ¼ge neue DHCP-Sektion ein"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Name"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Globale Optionen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren System-Administrator."
+msgstr ""
+"Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
+"System-Administrator."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr "DHCP-Objekte"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Protokollierung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "System"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Vorrat"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Host fÃ¼r Ausfallsicherung"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "DNS-Update-SchlÃ¼ssel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "DNS-Update-Zonen"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -182,16 +183,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr "Kommentare"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -207,213 +208,270 @@ msgstr "WÃ¤hlen Sie den zu erzeugenden Sektions-Typ"
 msgid "Create new DHCP section"
 msgstr "Erzeuge neue DHCP-Sektion"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr "PrimÃ¤rer Server"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr "PrimÃ¤rer Port"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr "SekundÃ¤rer Server"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr "SekundÃ¤rer Port"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr "AntwortverzÃ¶gerung"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "Algorithmus"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr "Geheim"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr "MaskenlÃ¤nge"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Bereich"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP Dienst"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr "PrimÃ¤rer DHCP-Server"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr "SekundÃ¤rer DHCP-Server"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "Hardware-Adresse"
 
@@ -426,11 +484,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP Dienst"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Dienst starten"
@@ -456,14 +509,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr "DHCP-Zonen"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/el_GR/fusiondirectory.po b/dhcp/locale/el_GR/fusiondirectory.po
index 68224604ca7e61279024a6213ef969623e1944c5..7df4078d50973aa944273c2bdf0fb68a626899cd 100644
--- a/dhcp/locale/el_GR/fusiondirectory.po
+++ b/dhcp/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· DHCP"
 
@@ -43,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -74,94 +73,94 @@ msgstr "Î£Ï…ÏÏÎ¯ÎºÎ½Ï‰ÏƒÎ· Ï…Ï€Î¿Î´Î¹ÎºÏ„ÏÎ¿Ï… DHCP"
 msgid "Fold"
 msgstr "Fold"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® Î½ÎÎ±Ï‚ ÎµÎ½ÏŒÏ„Î·Ï„Î±Ï‚ DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "ÎšÎ±Î¸Î¿Î»Î¹ÎºÎÏ‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr "Î¤Î± Ï„Î¼Î®Î¼Î±Ï„Î± Ï„Î¿Ï… DHCP Ï€Î¿Ï… Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒÏ‚ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "ÎšÎ±Ï„Î±Î³ÏÎ±Ï†Î®"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Class"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subclass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "ÎŒÎ½Î¿Î¼Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "ÎŸÎ¼Î¬Î´Î±"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "ÎŸÎ¼Î¬Î´Î±"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Î¥Ï€Î¿Î´Î¯ÎºÏ„Ï…Î¿"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿  Î´Î¯ÎºÏ„Ï…Î¿"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "ÎšÎ»ÎµÎ¹Î´Î¯ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·Ï‚ DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "Î–ÏŽÎ½ÎµÏ‚ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·Ï‚ DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -182,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -207,213 +206,270 @@ msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¿ ÎµÎ¯Î´Î¿Ï‚ Ï„Î·Ï‚ ÎµÎ½ÏŒÏ„Î·Ï„Î±Ï‚ Ï€Î¿Ï… Î¸Î± Î´
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "Î‘Î»Î³ÏŒÏÎ¹Î¸Î¼Î¿Ï‚"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Î•ÏÏÎ¿Ï‚"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î´Î¹ÎºÏ„ÏÎ¿Ï…"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Ï…Î»Î¹ÎºÎ¿Ï"
 
@@ -426,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± DHCP"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚"
@@ -456,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/en/fusiondirectory.po b/dhcp/locale/en/fusiondirectory.po
index 5ae0f44f8b918bd6880da58b0eaf45a7688e559a..b98004058f4c58da270abd809d63f8aaf63e4fe1 100644
--- a/dhcp/locale/en/fusiondirectory.po
+++ b/dhcp/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\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:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 #: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
 #: admin/dhcp/sections/class_dhcpDnsZone.inc:29
 #: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,12 +72,12 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: 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:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
+#: admin/dhcp/class_dhcpConfiguration.inc:566
 #: admin/dhcp/sections/class_dhcpHost.inc:29
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
+#: admin/dhcp/class_dhcpConfiguration.inc:568
 #: admin/dhcp/sections/class_dhcpPool.inc:29
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/class_dhcpConfiguration.inc:569
 #: admin/dhcp/sections/class_dhcpSubnet.inc:29
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
@@ -453,14 +453,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es/fusiondirectory.po b/dhcp/locale/es/fusiondirectory.po
index 97dc8e6761aeba5f065ce0f7040637c4eeace690..65cd05c53e7ac0a5f4e6563425fa6ee6e93157bc 100644
--- a/dhcp/locale/es/fusiondirectory.po
+++ b/dhcp/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "ConfiguraciÃ³n DHCP"
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,94 +73,96 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva secciÃ³n DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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."
+msgstr ""
+"La configuraciÃ³n DHCP es desconocida. Contacte con su administrador de "
+"sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Nodo de recuperaciÃ³n"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "Llave de actualizaciÃ³n DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "Zonas de actualizaciÃ³n DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +183,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +208,270 @@ msgstr "Seleccione el tipo de secciÃ³n para crear"
 msgid "Create new DHCP section"
 msgstr "Crear una nueva secciÃ³n DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Rango"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "DirecciÃ³n de red"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "DirecciÃ³n hardware"
 
@@ -424,11 +484,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Iniciar servicio"
@@ -454,14 +509,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_CO/fusiondirectory.po b/dhcp/locale/es_CO/fusiondirectory.po
index ce8f2ee1510654f42b0fff9930a68c6548a66a26..48d161c8813662bc6fc708b042e100f5f0826738 100644
--- a/dhcp/locale/es_CO/fusiondirectory.po
+++ b/dhcp/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "GRupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/es_VE/fusiondirectory.po b/dhcp/locale/es_VE/fusiondirectory.po
index 955d8051abb210c7337b766071d21b44c3a1366c..be9443ddd548c50fe76208c952ecf83d9529be09 100644
--- a/dhcp/locale/es_VE/fusiondirectory.po
+++ b/dhcp/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "ConfiguraciÃ³n DHCP"
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,94 +73,96 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva secciÃ³n DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Error"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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."
+msgstr ""
+"La configuraciÃ³n DHCP es desconocida. Contacte con su administrador de "
+"sistemas."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Registrando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Clase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subclase"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subred"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Nodo de recuperaciÃ³n"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "Llave de actualizaciÃ³n DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "Zonas de actualizaciÃ³n DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +183,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +208,270 @@ msgstr "Seleccione el tipo de secciÃ³n para crear"
 msgid "Create new DHCP section"
 msgstr "Crear una nueva secciÃ³n DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Rango"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "DirecciÃ³n de red"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servicio DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "DirecciÃ³n hardware"
 
@@ -424,11 +484,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servicio DHCP"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Iniciar servicio"
@@ -454,14 +509,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fa_IR/fusiondirectory.po b/dhcp/locale/fa_IR/fusiondirectory.po
index f6dac26681b0506df11df7dc79df54bc25d6c6a8..87bf436c54e08efab3b2566324415b74eeacb3a8 100644
--- a/dhcp/locale/fa_IR/fusiondirectory.po
+++ b/dhcp/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fi_FI/fusiondirectory.po b/dhcp/locale/fi_FI/fusiondirectory.po
index a80fcbbd049aa3c5d1caf941dbc419a189cc676c..4ca8e7bfefdcd8797e1f5b31c0fd82a0f3f190ff 100644
--- a/dhcp/locale/fi_FI/fusiondirectory.po
+++ b/dhcp/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/fr/fusiondirectory.po b/dhcp/locale/fr/fusiondirectory.po
index 96cf962cc043ed4ffaa2bf45ad4915844244ed16..8bd9bd8e7257c6f27d82f7e3e7c1a45e9da12503 100644
--- a/dhcp/locale/fr/fusiondirectory.po
+++ b/dhcp/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "Configuration DHCP"
 
@@ -43,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr "Branches oÃ¹ seront stockÃ©es les configurations dhcp"
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -74,94 +73,96 @@ msgstr "Replier le sous rÃ©seau"
 msgid "Fold"
 msgstr "Replier"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "InsÃ©rer une nouvelle section DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nom"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Options globales"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configuration DHCP est inconnue. Veuillez contacter votre administrateur systÃ¨me."
+msgstr ""
+"La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
+"systÃ¨me."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr "Objets dhcp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr "Les sections DHCP gÃ©rÃ©es par ce serveur"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Journaux systÃ¨mes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Sous classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "HÃ´te"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
-msgstr "Groupe"
+msgstr "Groupes"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "RÃ©servoir"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Sous rÃ©seau"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Pair de reprise sur panne"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "RÃ©seau partagÃ©"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "Clef de mise Ã  jour du DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "Zones DNS Ã  mettre Ã  jour"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr "Nom de cette configuration DHCP"
 
@@ -182,16 +183,16 @@ msgid "The DHCP statements"
 msgstr "Directives DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr "Commentaire"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr "Commentaire sur cet objet DHCP"
 
@@ -207,213 +208,295 @@ msgstr "Choisissez le type de section Ã  crÃ©er"
 msgid "Create new DHCP section"
 msgstr "CrÃ©er une nouvelle section DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr "Pair de reprise sur panne"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr "Serveur Principal"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
-msgstr "Adresse IP ou nom DNS du serveur jouant le rÃ´le de principal dans la configuration Failover et Load Balancing"
+msgstr ""
+"Adresse IP ou nom DNS du serveur jouant le rÃ´le de principal dans la "
+"configuration Failover et Load Balancing"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr "Port du serveur primaire"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
-msgstr "Port sur lequel le serveur principal Ã©coute les connexions de son homologue de basculement (serveur secondaire)"
+msgstr ""
+"Port sur lequel le serveur principal Ã©coute les connexions de son homologue "
+"de basculement (serveur secondaire)"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr "Serveur secondaire"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
-msgstr "Adresse IP ou nom DNS du serveur jouant le rÃ´le de serveur secondaire dans la configuration Failover et Load Balancing"
+msgstr ""
+"Adresse IP ou nom DNS du serveur jouant le rÃ´le de serveur secondaire dans "
+"la configuration Failover et Load Balancing"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr "Port du serveur secondaire"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
-msgstr "Port sur lequel le serveur secondaire Ã©coute les connexions Ã  partir de son homologue de basculement (serveur primaire)"
+msgstr ""
+"Port sur lequel le serveur secondaire Ã©coute les connexions Ã  partir de son "
+"homologue de basculement (serveur primaire)"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr "DÃ©lai de rÃ©ponse"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
-msgstr "Temps de rÃ©ponse maximal en secondes, avant que le serveur suppose que la connexion au pair de basculement a Ã©chouÃ©"
+msgstr ""
+"Temps de rÃ©ponse maximal en secondes, avant que le serveur suppose que la "
+"connexion au pair de basculement a Ã©chouÃ©"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr "Mise a jour sans ACK"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
-msgstr "Nombre de messages BHANDUP que le serveur peut envoyer avant qu'il reÃ§oive BNDACK de son homologue de basculement"
+msgstr ""
+"Nombre de messages BHANDUP que le serveur peut envoyer avant qu'il reÃ§oive "
+"BNDACK de son homologue de basculement"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
-msgstr "Configuration maximale du dÃ©lai d'exÃ©cution du client en secondes, tel que dÃ©fini dans DHCP Failover Protocol [FAILOVR]"
+msgstr ""
+"Configuration maximale du dÃ©lai d'exÃ©cution du client en secondes, tel que "
+"dÃ©fini dans DHCP Failover Protocol [FAILOVR]"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr "Separation"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr "Partage entre les serveurs primaires et secondaires pour failover"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr " HashBucketAssignment"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
-msgstr "HashBucketAssignment bit map pour le serveur DHCP, tel que dÃ©fini dans DHC Load Balancing Algorithm [RFC 3074]"
+msgstr ""
+"HashBucketAssignment bit map pour le serveur DHCP, tel que dÃ©fini dans DHC "
+"Load Balancing Algorithm [RFC 3074]"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
-msgstr "Temps de coupure en secondes, aprÃ¨s quoi l'Ã©quilibre de charge est dÃ©sactivÃ©"
+msgstr ""
+"Temps de coupure en secondes, aprÃ¨s quoi l'Ã©quilibre de charge est dÃ©sactivÃ©"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr "Zone de mise Ã  jour DNS DHCP"
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr "Serveur DNS de la zone"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr "serveur maÃ®tre de la zone DNS"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr "ClÃ© Tsig"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr "Le DN de la clef Tsig"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr "RÃ©seau partagÃ© DHCP"
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr "Classe DHCP"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr "Clef de mise Ã  jour du DNS par dhcp"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "Algorithme"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr "Algorithme pour gÃ©nÃ©rer la clÃ© TSIG"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr "Secret"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr "Secret pour gÃ©nÃ©rer TSIG Key"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr "Groupe DHCP"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr "Sous rÃ©seau DHCP"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr "Taille du masque"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
-msgstr "La longueur du masque de sous-rÃ©seau pour le sous-rÃ©seau. Le masque peut Ãªtre facilement calculÃ© Ã  partir de cette longueur."
+msgstr ""
+"La longueur du masque de sous-rÃ©seau pour le sous-rÃ©seau. Le masque peut "
+"Ãªtre facilement calculÃ© Ã  partir de cette longueur."
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Intervalle"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
-msgstr "Les adresses IP de dÃ©part et de fin dans la plage (inclues), sÃ©parÃ©s par un trait d'union; si la plage ne contient qu'une seule adresse, alors juste l'adresse peut Ãªtre spÃ©cifiÃ©e sans trait d'union. Chaque plage est dÃ©finie comme une valeur distincte."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
+msgstr ""
+"Les adresses IP de dÃ©part et de fin dans la plage (inclues), sÃ©parÃ©s par un "
+"espace; si la plage ne contient qu'une seule adresse, alors juste l'adresse "
+"peut Ãªtre spÃ©cifiÃ©e sans trait d'union. Chaque plage est dÃ©finie comme une "
+"valeur distincte."
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Adresse rÃ©seau"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr "Adresse rÃ©seau de ce sous-rÃ©seau"
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Service DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr "Serveur Primaire"
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr "Serveur DHCP primaire"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr "Serveur Secondaire"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr "Serveur DHCP secondaire"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr "Sous classe DHCP"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr "RÃ©servoir DHCP"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr "Liste de permissions"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
-msgstr "Cet attribut contient les listes de permissions associÃ©es Ã  un pool. Chaque liste de permission est dÃ©finie comme une valeur distincte."
+msgstr ""
+"Cet attribut contient les listes de permissions associÃ©es Ã  un pool. Chaque "
+"liste de permission est dÃ©finie comme une valeur distincte."
+
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr "HÃ´te DHCP"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr "Adresse mac du client"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr "Le type d'adresse matÃ©rielle"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "Adresse matÃ©rielle"
 
@@ -424,12 +507,9 @@ msgstr "Configuration DHCP"
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:34
 msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
-msgstr "Le DN de(s) objet(s) dhcpService qui contiennent les informations de configuration"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Service DHCP"
+msgstr ""
+"Le DN de(s) objet(s) dhcpService qui contiennent les informations de "
+"configuration"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
@@ -446,7 +526,8 @@ msgstr "RedÃ©marrer le service"
 #: admin/systems/class_dhcpSystem.inc:29
 msgid ""
 "The DHCP configuration or subsection in which this host should be added"
-msgstr "La configuration DHCP ou sous section dans lequel cet hÃ´te doit Ãªtre ajoutÃ©"
+msgstr ""
+"La configuration DHCP ou sous section dans lequel cet hÃ´te doit Ãªtre ajoutÃ©"
 
 #: admin/systems/class_dhcpSystem.inc:33
 msgid "The Mac address to use in the DHCP host record"
@@ -456,14 +537,14 @@ msgstr "L'adresse Mac Ã  utiliser dans l'enregistrement d'hÃ´te DHCP"
 msgid "The IP address to use in the DHCP host record"
 msgstr "L'adresse IP Ã  utiliser dans l'enregistrement d'hÃ´te DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr "Modifier les zones DHCP d'un systÃ¨me"
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr "Zones DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr "HÃ´tes dhcp dÃ©clarÃ©s pour ce systÃ¨me"
diff --git a/dhcp/locale/hu_HU/fusiondirectory.po b/dhcp/locale/hu_HU/fusiondirectory.po
index 047a7a959f5360667dee55c843d27ca25cd9d7e0..bf19b35ab2472e316f1b79b04bcf1644859e3754 100644
--- a/dhcp/locale/hu_HU/fusiondirectory.po
+++ b/dhcp/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/id/fusiondirectory.po b/dhcp/locale/id/fusiondirectory.po
index 4795fe44bdbed0c59661113a6a2e1b6feb9ca318..698a474130a3d02d09f5b43c7bf1db44b415b74e 100644
--- a/dhcp/locale/id/fusiondirectory.po
+++ b/dhcp/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +41,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +72,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +180,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +205,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +481,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +506,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/it_IT/fusiondirectory.po b/dhcp/locale/it_IT/fusiondirectory.po
index 629a156a543b7499115dba149279c5a0f78dc8db..e554ad9cb83a6dcf6083949853503a0096b94adc 100644
--- a/dhcp/locale/it_IT/fusiondirectory.po
+++ b/dhcp/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-11-13 15:44+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "Configurazione del DHCP"
 
@@ -44,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr "Ramo in cui le configurazioni DHCP saranno immagazzinate"
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -75,94 +73,96 @@ msgstr "Ripiega la sottorete DHCP"
 msgid "Fold"
 msgstr "Piega"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserisci una nuova sezione DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
-msgstr "La configurazione DHCP impostata Ã¨ sconosciuta. Contatta l'amministratore del sistema."
+msgstr ""
+"La configurazione DHCP impostata Ã¨ sconosciuta. Contatta l'amministratore "
+"del sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr "Oggetti DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr "Sezioni DHCP gestite da questo server"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Giornale di sistema"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Categoria"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Sottoclasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Deposito"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Sottorete"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Partner per la presa di controllo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Rete condivisa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "Stile di aggiornamento dinamico del DNS"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "Aggiornamento delle zone DNS"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr "Nome di questa configurazione DHCP"
 
@@ -183,16 +183,16 @@ msgid "The DHCP statements"
 msgstr "Le istruzioni DHCP"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr "Commenti"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr "Commenti su questo oggetto DHCP"
 
@@ -208,213 +208,295 @@ msgstr "Scegli il tipo di sezione da creare"
 msgid "Create new DHCP section"
 msgstr "Crea una nuova sezione DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr "Peer di failover DHCP"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr "Server primario"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
-msgstr "Indirizzo IP o nome DNS del server che gioca un rulo primario nel Load Balancing DHC e Fail Over"
+msgstr ""
+"Indirizzo IP o nome DNS del server che gioca un rulo primario nel Load "
+"Balancing DHC e Fail Over"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr "Porto primario"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
-msgstr "Porto su cui il server primario ascolta le connessioni dal proprio fail over peer (server secondario)"
+msgstr ""
+"Porto su cui il server primario ascolta le connessioni dal proprio fail over"
+" peer (server secondario)"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr "Server secondario"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
-msgstr "Indirizzo IP o nome DNS del server che gioca un rulo secondario nel Load Balancing DHC e Fail Over"
+msgstr ""
+"Indirizzo IP o nome DNS del server che gioca un rulo secondario nel Load "
+"Balancing DHC e Fail Over"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr "Porto secondario"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
-msgstr "Porto su cui il server secondario ascolta le connessioni dal proprio fail over peer (server primario)"
+msgstr ""
+"Porto su cui il server secondario ascolta le connessioni dal proprio fail "
+"over peer (server primario)"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr "Tempo di risposta"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
-msgstr "Ttempo di risposta massimo in secondi, prima che Server presupponga che il collegamento al failover peer non Ã¨ riuscito"
+msgstr ""
+"Ttempo di risposta massimo in secondi, prima che Server presupponga che il "
+"collegamento al failover peer non Ã¨ riuscito"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr "Aggiornamenti non riscontrati"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
-msgstr "Numero di messaggi BNDUPD che il server puo inviare prima di ricevere BNDACK dal proprio fail over peer"
+msgstr ""
+"Numero di messaggi BNDUPD che il server puo inviare prima di ricevere BNDACK"
+" dal proprio fail over peer"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr "Massimo Lead Time Cliente"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
-msgstr "Tempo massimo di configurazione Client Lead in secondi, come definito nel Protocollo Failover [FAILOVR]"
+msgstr ""
+"Tempo massimo di configurazione Client Lead in secondi, come definito nel "
+"Protocollo Failover [FAILOVR]"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr "Divisione"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr "Divisione tra i server primari e secondari a fini di failover"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr "HashBucketAssignment"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
-msgstr "HashBucketAssignment bitmap per il server DHCP, come definito nell'Algoritmo di Bilanciamento del Carico DHC [RFC 3074]"
+msgstr ""
+"HashBucketAssignment bitmap per il server DHCP, come definito nell'Algoritmo"
+" di Bilanciamento del Carico DHC [RFC 3074]"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr "Tempo di bilanciamento del carico"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
-msgstr "Tempo di taglio in secondi, dopo di che il bilanciamento di carico viene disattivato"
+msgstr ""
+"Tempo di taglio in secondi, dopo di che il bilanciamento di carico viene "
+"disattivato"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr "Zona di aggiornamento DHCP DNS"
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr "Zona Server DNS"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr "Server master della zona DNS"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr "Chiave di transazione"
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
-msgstr "La chiave di transazione DN"
+msgstr "La chciave di transazione DN"
+
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr "Rete condivisa DHCP"
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr "Classe DHCP"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr "Chiave di aggiornamento DHCP DNS"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "Algoritmo"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr "Algoritmo per generare la Chiave TSIG"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr "Segreto"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr "Segreto per generare la chiave TSIG"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr "Gruppo DHCP"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr "Subnet DHCP"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr "Nascondere la lunghezza"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
-msgstr "La lunghezza della  maschera sottorete per la sottorete. La maschera puo essere facilmente calcolata da questa lunghezza."
+msgstr ""
+"La lunghezza della  maschera sottorete per la sottorete. La maschera puo "
+"essere facilmente calcolata da questa lunghezza."
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Intervallo (Range)"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
-msgstr "Gli Indirizzi IP di inizio e di fine nella gamma (inclusa), separati da un trattino; se la gamma contiene un unico indirizzo, allora solo l'indirizzo puo essere specificato senza trattino. Ogni intervallo Ã¨ definito come un valore distinto."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
+msgstr ""
+"Gli indirizzi IP di partenza e di fine dell'intervallo (compreso), separati "
+"da uno spazio; se l'intervallo contiene solo un indirizzo, solo l'indirizzo "
+"puÃ² essere specificato. Ogni gamma Ã¨ definita come un valore separato."
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Indirizzo di rete"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr "Indirizzo di rete di questa sottorete"
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "Servizio DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr "DHCP Primario"
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr "Server DHCP primario"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr "DHCP Secondario"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr "Server DHCP secondario"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr "Sottoclasse DHCP"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr "Pool DHCP"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr "Lista dei permessi"
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
-msgstr "Questo attributo contiene gli elenchi di permessi associati ad un pool. Ogni lista di permessi viene definita come un valore distinto."
+msgstr ""
+"Questo attributo contiene gli elenchi di permessi associati ad un pool. Ogni"
+" lista di permessi viene definita come un valore distinto."
+
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr "Host DHCP"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr "L'indirizzo hardware del cliente"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr "Il tipo di indirizzo hardware"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "Indirizzo hardware"
 
@@ -425,12 +507,9 @@ msgstr "Configurazioni DHCP"
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:34
 msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
-msgstr "DN dell'oggetto (degli oggetti) dhcpService che contiene le informazioni di configurazione"
-
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "Servizio DHCP"
+msgstr ""
+"DN dell'oggetto(degli oggetti) dhcpService che contiene le informazioni di "
+"configurazione"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
@@ -457,14 +536,14 @@ msgstr "Indirizzo MAC da utilizzare nella registrazione dell'host DHCP"
 msgid "The IP address to use in the DHCP host record"
 msgstr "Indirizzo IP da utilizzare nella registrazione dell'host DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr "Modifica le zone DHCP di un sistema"
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr "Zone DHCP"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr "Hosts DHCP dichiarati per questo sistema"
diff --git a/dhcp/locale/lv/fusiondirectory.po b/dhcp/locale/lv/fusiondirectory.po
index d187ab66a2ba35aa9674d7e7d136e3c357bfd011..6d29cd6768e3bf469539b053eed979a2d903eadd 100644
--- a/dhcp/locale/lv/fusiondirectory.po
+++ b/dhcp/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nb/fusiondirectory.po b/dhcp/locale/nb/fusiondirectory.po
index 396b652dccf0551d278a54db15c0b7af963d7393..1237fc9fde2fd671cd7e14f1736a6792692e8537 100644
--- a/dhcp/locale/nb/fusiondirectory.po
+++ b/dhcp/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Navn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Vert"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/nl/fusiondirectory.po b/dhcp/locale/nl/fusiondirectory.po
index 2aaf6d2229fa76d79345761bca0db2bb08e14024..d52db18671da1ec0bfce8e0b359e0477b189b5ff 100644
--- a/dhcp/locale/nl/fusiondirectory.po
+++ b/dhcp/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,33 +19,33 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr "DHCP configuratie"
 
 #: config/dhcp/class_dhcpConfig.inc:29
 msgid "FusionDirectory dhcp plugin configuration"
-msgstr ""
+msgstr "FusionDirectory dhcp plugin configuratie"
 
 #: config/dhcp/class_dhcpConfig.inc:41
 msgid "DHCP config"
-msgstr ""
+msgstr "DHCP configuratie"
 
 #: config/dhcp/class_dhcpConfig.inc:44
 msgid "DHCP RDN"
-msgstr ""
+msgstr "DHCP RDN"
 
 #: config/dhcp/class_dhcpConfig.inc:44
 msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -72,96 +73,98 @@ msgstr "Verklein DHCP subnet"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Naam"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Globale opties"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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."
+msgstr ""
+"De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
+"systeembeheerder."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
-msgstr ""
+msgstr "DHCP objecten"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Loggen"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Klasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subklasse"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Groep"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "Subnet"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "DNS update sleutel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "DNS update zones"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
-msgstr ""
+msgstr "Naam van de DHCP configuratie"
 
 #: admin/dhcp/class_dhcpPlugin.inc:39
 msgid "Options"
@@ -169,7 +172,7 @@ msgstr "Opties"
 
 #: admin/dhcp/class_dhcpPlugin.inc:39
 msgid "The DHCP options"
-msgstr ""
+msgstr "De DHCP opties"
 
 #: admin/dhcp/class_dhcpPlugin.inc:47
 msgid "Statements"
@@ -180,18 +183,18 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
-msgstr ""
+msgstr "Commentaren"
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
-msgstr ""
+msgstr "Commentaren over dit DHCP object"
 
 #: admin/dhcp/class_dhcpSectionCreationDialog.inc:52
 msgid "Section"
@@ -205,230 +208,282 @@ msgstr "Selecteer het aan te maken sectie type"
 msgid "Create new DHCP section"
 msgstr "Nieuwe DHCP sectie aanmaken"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
-msgid "Primary server"
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
+msgid "Primary server"
+msgstr "Primaire server"
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
-msgstr ""
+msgstr "Primaire poort"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
-msgstr ""
+msgstr "Secundaire server"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
-msgstr ""
+msgstr "Secundaire poort"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
-msgid "Algorithm"
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
+msgid "Algorithm"
+msgstr "Algoritme"
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr "DHCP groep"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr "DHCP subnet"
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Reeks"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Netwerkadres"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
-msgstr ""
+msgstr "Netwerkadres van dit subnet"
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP service"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
-msgstr ""
+msgstr "Primaire DHCP server"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
-msgstr ""
+msgstr "Secundaire DHCP"
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
+msgstr "Secundaire DHCP server"
+
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr "DHCP pool"
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "Hardware adres"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:29
 msgid "DHCP configurations"
-msgstr ""
+msgstr "DHCP configuraties"
 
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:34
 msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP service"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Start service"
@@ -454,14 +509,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
-msgstr ""
+msgstr "DHCP zone"
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pl/fusiondirectory.po b/dhcp/locale/pl/fusiondirectory.po
index 0f917599c87a90207b2a48f42011bdd48d86cd47..a57c71aedc6f254fc5b258a9a962a9b8152aa23f 100644
--- a/dhcp/locale/pl/fusiondirectory.po
+++ b/dhcp/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Klasa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Adres sieciowy"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Uruchom usÅ‚ugÄ™"
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt/fusiondirectory.po b/dhcp/locale/pt/fusiondirectory.po
index 4960a952c518c13f551ad0de70305c45436e190f..281016679b8ecf538e7f5f1505c0f79cfed64981 100644
--- a/dhcp/locale/pt/fusiondirectory.po
+++ b/dhcp/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/pt_BR/fusiondirectory.po b/dhcp/locale/pt_BR/fusiondirectory.po
index 5c392e541e993dfc955aa14b48d40e69c5a4b29f..1c0897b3f910815314e0582ddeaa8f3dd9a32eac 100644
--- a/dhcp/locale/pt_BR/fusiondirectory.po
+++ b/dhcp/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,96 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Inserir nova seÃ§Ã£o DHCP"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Nome"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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."
+msgstr ""
+"A configuraÃ§Ã£o de DHCP Ã© desconhecida. Por favor, contacte seu administrador"
+" do sistema."
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Logando"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Classe"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +183,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +208,270 @@ msgstr "Escolha um tipo de seÃ§Ã£o a ser criado"
 msgid "Create new DHCP section"
 msgstr "Criar nova seÃ§Ã£o DHCP"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Faixa de IP's"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "EndereÃ§o de rede"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "ServiÃ§o DHCP"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +484,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "ServiÃ§o DHCP"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Iniciar serviÃ§o"
@@ -454,14 +509,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru/fusiondirectory.po b/dhcp/locale/ru/fusiondirectory.po
index 742d70a680faeba4d351f6a745fcffbfa1b4099b..72444e96daf76ebfa02a438ce13c90585be8e0e8 100644
--- a/dhcp/locale/ru/fusiondirectory.po
+++ b/dhcp/locale/ru/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -42,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr "DHCP"
 
@@ -73,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
-msgstr ""
+msgstr "ÐšÐ»Ð°ÑÑ"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Ð¥Ð¾ÑÑ‚"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -181,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -206,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr "ÐÐ»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼"
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Ð”Ð¸Ð°Ð¿Ð¾Ð·Ð¾Ð½"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -425,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Ð—Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ»ÑƒÐ¶Ð±Ñƒ"
@@ -455,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ru@petr1708/fusiondirectory.po b/dhcp/locale/ru@petr1708/fusiondirectory.po
index 3c41483bcb0ba90af6be2f0ba0452339d58a444c..87bf16ec11f6d6d73bb9b108af81feb8145b3587 100644
--- a/dhcp/locale/ru@petr1708/fusiondirectory.po
+++ b/dhcp/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +41,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +72,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +180,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +205,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +481,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +506,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/sv/fusiondirectory.po b/dhcp/locale/sv/fusiondirectory.po
index 243fee2ae77caa9b256e13e4c02df1c9860e55a6..214e3e3a7f79502cfa78573e61c0f0c8db6466e7 100644
--- a/dhcp/locale/sv/fusiondirectory.po
+++ b/dhcp/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr "Minimera DHCP-subnÃ¤t"
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr "Infoga ny DHCP-sektion"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "Namn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr "Globala instÃ¤llningar"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 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:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr "Loggning"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "Klass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr "Subklass"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr "Host"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "Grupp"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr "Pool"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr "SubnÃ¤t"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr "Failover peer"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr "Delat nÃ¤tverk"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr "DNS-uppdateringsnyckel"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr "DNS-uppdateringszoner"
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr "VÃ¤lj sektionstyp att skapa"
 msgid "Create new DHCP section"
 msgstr "Skapa ny DHCP-sektion"
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr "Range"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "NÃ¤tverksadress"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr "DHCP-tjÃ¤nst"
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr "FDDI"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr "HÃ¥rdvaruadress"
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr "DHCP-tjÃ¤nst"
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr "Starta tjÃ¤nsten"
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/ug/fusiondirectory.po b/dhcp/locale/ug/fusiondirectory.po
index bedcb1667c52d9e1b8cebe4fabf9e82f4e4357b1..67a3e7269abb21f91954961cfd1fb0af203ebfb5 100644
--- a/dhcp/locale/ug/fusiondirectory.po
+++ b/dhcp/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +18,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +41,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +72,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +180,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +205,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +481,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +506,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/vi_VN/fusiondirectory.po b/dhcp/locale/vi_VN/fusiondirectory.po
index 01e0f9f8b13f7cb842f3ca3a671ec1672f946db2..aec724c8f8ac14f8dc1cf18593e4dbd7447ab18b 100644
--- a/dhcp/locale/vi_VN/fusiondirectory.po
+++ b/dhcp/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "NhÃ³m "
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dhcp/locale/zh/fusiondirectory.po b/dhcp/locale/zh/fusiondirectory.po
index 162eeea8b7d50ad8675d47785fe637e40b3042ad..4759f83556c98fdf803239103a88b272c37b739f 100644
--- a/dhcp/locale/zh/fusiondirectory.po
+++ b/dhcp/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: config/dhcp/class_dhcpConfig.inc:28
-#: admin/dhcp/class_dhcpConfiguration.inc:518
 #: admin/dhcp/class_dhcpConfiguration.inc:519
-#: admin/dhcp/class_dhcpConfiguration.inc:521
+#: admin/dhcp/class_dhcpConfiguration.inc:520
+#: admin/dhcp/class_dhcpConfiguration.inc:522
 msgid "DHCP configuration"
 msgstr ""
 
@@ -41,10 +42,10 @@ msgid "Branch in which DHCP configurations will be stored"
 msgstr ""
 
 #: admin/dhcp/class_dhcpManagement.inc:34 admin/dhcp/class_dhcpPlugin.inc:31
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
-#: admin/systems/class_dhcpSystem.inc:215
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:39
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:39
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:39
+#: admin/systems/class_dhcpSystem.inc:212
 msgid "DHCP"
 msgstr ""
 
@@ -72,94 +73,94 @@ msgstr ""
 msgid "Fold"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:110
 #: admin/dhcp/class_dhcpConfiguration.inc:111
+#: admin/dhcp/class_dhcpConfiguration.inc:112
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:245
+#: admin/dhcp/class_dhcpConfiguration.inc:246
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:365
-#: admin/dhcp/class_dhcpConfiguration.inc:406
-#: admin/dhcp/class_dhcpConfiguration.inc:562
+#: admin/dhcp/class_dhcpConfiguration.inc:366
+#: admin/dhcp/class_dhcpConfiguration.inc:407
+#: admin/dhcp/class_dhcpConfiguration.inc:563
 msgid "Global options"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:421
+#: admin/dhcp/class_dhcpConfiguration.inc:422
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:540
+#: admin/dhcp/class_dhcpConfiguration.inc:541
 msgid "DHCP Objects"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:550
+#: admin/dhcp/class_dhcpConfiguration.inc:551
 msgid "The DHCP sections handled by this server"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:561
+#: admin/dhcp/class_dhcpConfiguration.inc:562
 msgid "Logging"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:563
+#: admin/dhcp/class_dhcpConfiguration.inc:564
 msgid "Class"
 msgstr "ç±»"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:564
+#: admin/dhcp/class_dhcpConfiguration.inc:565
 msgid "Subclass"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:565
-#: admin/dhcp/sections/class_dhcpHost.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/sections/class_dhcpHost.inc:39
 msgid "Host"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:566
+#: admin/dhcp/class_dhcpConfiguration.inc:567
 msgid "Group"
 msgstr "ç»„"
 
-#: admin/dhcp/class_dhcpConfiguration.inc:567
-#: admin/dhcp/sections/class_dhcpPool.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:568
+#: admin/dhcp/sections/class_dhcpPool.inc:39
 msgid "Pool"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:568
-#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/sections/class_dhcpSubnet.inc:39
 msgid "Subnet"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:569
+#: admin/dhcp/class_dhcpConfiguration.inc:570
 msgid "Failover peer"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:570
+#: admin/dhcp/class_dhcpConfiguration.inc:571
 msgid "Shared network"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:571
+#: admin/dhcp/class_dhcpConfiguration.inc:572
 msgid "DNS update key"
 msgstr ""
 
-#: admin/dhcp/class_dhcpConfiguration.inc:572
+#: admin/dhcp/class_dhcpConfiguration.inc:573
 msgid "DNS update zones"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:34
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:32
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:32
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:32
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:42
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:42
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:42
 msgid "Name of this DHCP configuration"
 msgstr ""
 
@@ -180,16 +181,16 @@ msgid "The DHCP statements"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments"
 msgstr ""
 
 #: admin/dhcp/class_dhcpPlugin.inc:53
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:83
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:44
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:93
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:54
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:55
 msgid "Comments about this DHCP object"
 msgstr ""
 
@@ -205,213 +206,270 @@ msgstr ""
 msgid "Create new DHCP section"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:28
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:29
+msgid "DHCP failover peer"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid "Primary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:36
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:46
 msgid ""
 "IP address or DNS name of the server playing primary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid "Primary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:40
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:50
 msgid ""
 "Port on which primary server listens for connections from its fail over peer"
 " (secondary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid "Secondary server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:45
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:55
 msgid ""
 "IP address or DNS name of the server playing secondary role in DHC Load "
 "Balancing and Fail over"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid "Secondary port"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:49
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
 msgid ""
 "Port on which secondary server listens for connections from its fail over "
 "peer (primary server)"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid "Response delay"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:54
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
 msgid ""
 "Maximum response time in seconds, before Server assumes that connection to "
 "fail over peer has failed"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid "Unacked updates"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:59
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
 msgid ""
 "Number of BNDUPD messages that server can send before it receives BNDACK "
 "from its fail over peer"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid "Maximum Client Lead Time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:64
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
 msgid ""
 "Maximum Client Lead Time configuration in seconds, as defined in DHCP "
 "Failover Protocol [FAILOVR]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:69
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:79
 msgid "Split between the primary and secondary servers for fail over purpose"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid "HashBucketAssignment"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:74
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:84
 msgid ""
 "HashBucketAssignment bit map for the DHCP Server, as defined in DHC Load "
 "Balancing Algorithm [RFC 3074]"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Load balance time"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:78
+#: admin/dhcp/sections/class_dhcpFailOverPeer.inc:88
 msgid "Cutoff time in seconds, after which load balance is disabled"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:28
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:29
+msgid "DHCP DNS update zone"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "DNS Zone Server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:36
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:46
 msgid "Master server of the DNS Zone"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "Tsig key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpDnsZone.inc:40
+#: admin/dhcp/sections/class_dhcpDnsZone.inc:50
 msgid "The TSig key DN"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:28
+#: admin/dhcp/sections/class_dhcpSharedNetwork.inc:29
+msgid "DHCP shared network"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpClass.inc:28
+#: admin/dhcp/sections/class_dhcpClass.inc:29
+msgid "DHCP class"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:28
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:29
+msgid "DHCP DNS update key"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:36
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:46
 msgid "Algorithm to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpTSigKey.inc:41
+#: admin/dhcp/sections/class_dhcpTSigKey.inc:51
 msgid "Secret to generate TSIG Key"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpGroup.inc:28
+#: admin/dhcp/sections/class_dhcpGroup.inc:29
+msgid "DHCP group"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:28
+#: admin/dhcp/sections/class_dhcpSubnet.inc:29
+msgid "DHCP subnet"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid "Mask length"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:32
+#: admin/dhcp/sections/class_dhcpSubnet.inc:42
 msgid ""
 "The subnet mask length for the subnet. The mask can be easily computed from "
 "this length."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid "Range"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:38
-#: admin/dhcp/sections/class_dhcpPool.inc:33
+#: admin/dhcp/sections/class_dhcpSubnet.inc:48
+#: admin/dhcp/sections/class_dhcpPool.inc:43
 msgid ""
 "The starting & ending IP Addresses in the range (inclusive), separated by a "
-"hyphen; if the range only contains one address, then just the address can be"
-" specified with no hyphen. Each range is defined as a separate value."
+"space; if the range only contains one address, then just the address can be "
+"specified. Each range is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address"
 msgstr "ç½‘ç»œåœ°å€"
 
-#: admin/dhcp/sections/class_dhcpSubnet.inc:45
+#: admin/dhcp/sections/class_dhcpSubnet.inc:57
 msgid "Network address of this subnet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:28
+#: admin/dhcp/sections/class_dhcpService.inc:29
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
+#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
+msgid "DHCP service"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "DHCP Primary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:36
+#: admin/dhcp/sections/class_dhcpService.inc:46
 msgid "Primary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "DHCP Secondary"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpService.inc:37
+#: admin/dhcp/sections/class_dhcpService.inc:47
 msgid "Secondary DHCP server"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpSubClass.inc:28
+#: admin/dhcp/sections/class_dhcpSubClass.inc:29
+msgid "DHCP subclass"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:28
+#: admin/dhcp/sections/class_dhcpPool.inc:29
+msgid "DHCP pool"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid "Permit list"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpPool.inc:39
+#: admin/dhcp/sections/class_dhcpPool.inc:51
 msgid ""
 "This attribute contains the permit lists associated with a pool. Each permit"
 " list is defined as a separate value."
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:32
-#: admin/dhcp/sections/class_dhcpHost.inc:41
+#: admin/dhcp/sections/class_dhcpHost.inc:28
+#: admin/dhcp/sections/class_dhcpHost.inc:29
+msgid "DHCP host"
+msgstr ""
+
+#: admin/dhcp/sections/class_dhcpHost.inc:42
+#: admin/dhcp/sections/class_dhcpHost.inc:51
 msgid "The client hardware address"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:35
+#: admin/dhcp/sections/class_dhcpHost.inc:45
 msgid "The hardware address type"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Ethernet"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "FDDI"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:38
+#: admin/dhcp/sections/class_dhcpHost.inc:48
 msgid "Token Ring"
 msgstr ""
 
-#: admin/dhcp/sections/class_dhcpHost.inc:48
+#: admin/dhcp/sections/class_dhcpHost.inc:58
 msgid "Hardware address"
 msgstr ""
 
@@ -424,11 +482,6 @@ msgid ""
 "The DN of dhcpService object(s) which contain the configuration information"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:46
-#: admin/systems/services/dhcp/class_serviceDHCP.inc:47
-msgid "DHCP service"
-msgstr ""
-
 #: admin/systems/services/dhcp/class_serviceDHCP.inc:55
 msgid "Start service"
 msgstr ""
@@ -454,14 +507,14 @@ msgstr ""
 msgid "The IP address to use in the DHCP host record"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:216
+#: admin/systems/class_dhcpSystem.inc:213
 msgid "Edit the DHCP zones of a system"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:230
+#: admin/systems/class_dhcpSystem.inc:227
 msgid "DHCP zones"
 msgstr ""
 
-#: admin/systems/class_dhcpSystem.inc:234
+#: admin/systems/class_dhcpSystem.inc:231
 msgid "DHCP hosts declared for this system"
 msgstr ""
diff --git a/dns/admin/dns/class_DnsRecordAttribute.inc b/dns/admin/dns/class_DnsRecordAttribute.inc
index 3f186a4ae0f94c4c9166923ea2dbeac57dd04372..3ba3bac6bde41c5c0cb702b367db2b895cee9c49 100644
--- a/dns/admin/dns/class_DnsRecordAttribute.inc
+++ b/dns/admin/dns/class_DnsRecordAttribute.inc
@@ -160,6 +160,157 @@ class DnsRecordAttribute extends CompositeAttribute
     }
   }
 
+  private function loadLocRecordFields($ldapName)
+  {
+    $this->attributes[1] = new LocRecordAttribute(
+      _('LOC Record'),
+      $ldapName,
+      array(
+        'lat' => new LocRecordLatLongAttribute(
+          _('Latitude'), _('Latitude'),
+          $ldapName.'_latitude',
+          array(
+            'degrees' => new IntAttribute(
+              '', _('Degrees'),
+              $ldapName.'_lat_degrees', TRUE,
+              0, 90, ''
+            ),
+            'minutes' => new IntAttribute(
+              'Â°', _('Minutes'),
+              $ldapName.'_lat_minutes', FALSE,
+              0, 59, ''
+            ),
+            'seconds' => new FloatAttribute(
+              'â€™', _('Seconds'),
+              $ldapName.'_lat_seconds', FALSE,
+              0, 59.999, ''
+            ),
+            'dir' => new SelectAttribute(
+              '', _('North/South'),
+              $ldapName.'_lat_direction', TRUE,
+              array('N', 'S'), '',
+              array(_('North'), _('South'))
+            ),
+          )
+        ),
+        'long' => new LocRecordLatLongAttribute(
+          _('Longitude'), _('Longitude'),
+          $ldapName.'_longitude',
+          array(
+            'degrees' => new IntAttribute(
+              '', _('Degrees'),
+              $ldapName.'_long_degrees', TRUE,
+              0, 180, ''
+            ),
+            'minutes' => new IntAttribute(
+              'Â°', _('Minutes'),
+              $ldapName.'_long_minutes', FALSE,
+              0, 59, ''
+            ),
+            'seconds' => new FloatAttribute(
+              'â€™', _('Seconds'),
+              $ldapName.'_long_seconds', FALSE,
+              0, 59.999, ''
+            ),
+            'dir' => new SelectAttribute(
+              '', _('East/West'),
+              $ldapName.'_long_direction', TRUE,
+              array('E', 'W'), '',
+              array(_('East'), _('West'))
+            ),
+          )
+        ),
+        'alt' => new FloatAttribute(
+          _('Altitude (meters)'), '',
+          $ldapName.'_altitude', TRUE,
+          -100000.00, 42849672.95, ''
+        ),
+        'size' => new FloatAttribute(
+          _('Size (meters)'), '',
+          $ldapName.'_size', FALSE,
+          0, 90000000, ''
+        ),
+        'hp' => new FloatAttribute(
+          _('Horizontal precision (meters)'), '',
+          $ldapName.'_hp', FALSE,
+          0, 90000000, ''
+        ),
+        'vp' => new FloatAttribute(
+          _('Vertical precision (meters)'), '',
+          $ldapName.'_vp', FALSE,
+          0, 90000000, ''
+        ),
+      )
+    );
+  }
+
+  private function loadNaptrRecordFields($ldapName)
+  {
+    $this->attributes[1] = new CharSeparatedCompositeAttribute(
+      _('NAPTR Record'),
+      $ldapName,
+      array(
+        new IntAttribute(
+          _('Order'), _('Integer specifying the order in which the NAPTR records MUST be processed to ensure the correct ordering of rules.  Low numbers are processed before high numbers.'),
+          $ldapName.'_order', TRUE,
+          0, FALSE
+        ),
+        new IntAttribute(
+          _('Preference'), _('Integer that specifies the order in which NAPTR records with equal "order" values SHOULD be processed, low numbers being processed before high numbers.'),
+          $ldapName.'_pref', TRUE,
+          0, FALSE
+        ),
+        new StringAttribute(
+          _('Flags'), _('Flags to control aspects of the rewriting and interpretation of the fields in the record. Flags are single characters from the set [A-Z0-9].  The case of the alphabetic characters is not significant.'),
+          $ldapName.'_flags', TRUE
+        ),
+        new StringAttribute(
+          _('Service'), _('Specifies the service(s) available down this rewrite path. It may also specify the particular protocol that is used to talk with a service. A protocol MUST be specified if the flags field states that the NAPTR is terminal.'),
+          $ldapName.'_service', TRUE
+        ),
+        new StringAttribute(
+          _('Regular Expression'), _('A STRING containing a substitution expression that is applied to the original string held by the client in order to construct the next domain name to lookup.'),
+          $ldapName.'_regexp', TRUE
+        ),
+        new StringAttribute(
+          _('Replacement'), _('The next NAME to query for NAPTR, SRV, or address records depending on the value of the flags field.'),
+          $ldapName.'_replace', TRUE
+        ),
+      ),
+      ' '
+    );
+  }
+
+  private function loadSrvRecordFields($ldapName)
+  {
+    $this->attributes[1] = new CharSeparatedCompositeAttribute(
+      _('SRV Record'),
+      $ldapName,
+      array(
+        new IntAttribute(
+          _('Priority'), _('Priority of the target host, lower value means more preferred'),
+          $ldapName.'_priority', TRUE,
+          0, FALSE
+        ),
+        new IntAttribute(
+          _('Weight'), _('Relative weight for records with the same priority, higher value means more preferred'),
+          $ldapName.'_weight', TRUE,
+          0, FALSE
+        ),
+        new IntAttribute(
+          _('Port'), _('TCP or UDP port on which the service is to be found'),
+          $ldapName.'_port', TRUE,
+          0, FALSE
+        ),
+        new StringAttribute(
+          _('Target'), _('Canonical hostname of the machine providing the service, ending in a dot'),
+          $ldapName.'_target', TRUE
+        ),
+      ),
+      ' '
+    );
+  }
+
   protected function updateFields()
   {
     $type = $this->attributes[0]->getValue();
@@ -181,86 +332,7 @@ class DnsRecordAttribute extends CompositeAttribute
           );
         break;
         case 'LocRecord':
-          $this->attributes[1] = new LocRecordAttribute(
-            _('LOC Record'),
-            $ldapName,
-            array(
-              'lat' => new LocRecordLatLongAttribute(
-                _('Latitude'), _('Latitude'),
-                $ldapName.'_latitude',
-                array(
-                  'degrees' => new IntAttribute(
-                    '', _('Degrees'),
-                    $ldapName.'_lat_degrees', TRUE,
-                    0, 90, ''
-                  ),
-                  'minutes' => new IntAttribute(
-                    'Â°', _('Minutes'),
-                    $ldapName.'_lat_minutes', FALSE,
-                    0, 59, ''
-                  ),
-                  'seconds' => new FloatAttribute(
-                    'â€™', _('Seconds'),
-                    $ldapName.'_lat_seconds', FALSE,
-                    0, 59.999, ''
-                  ),
-                  'dir' => new SelectAttribute(
-                    '', _('North/South'),
-                    $ldapName.'_lat_direction', TRUE,
-                    array('N', 'S'), '',
-                    array(_('North'), _('South'))
-                  ),
-                )
-              ),
-              'long' => new LocRecordLatLongAttribute(
-                _('Longitude'), _('Longitude'),
-                $ldapName.'_longitude',
-                array(
-                  'degrees' => new IntAttribute(
-                    '', _('Degrees'),
-                    $ldapName.'_long_degrees', TRUE,
-                    0, 180, ''
-                  ),
-                  'minutes' => new IntAttribute(
-                    'Â°', _('Minutes'),
-                    $ldapName.'_long_minutes', FALSE,
-                    0, 59, ''
-                  ),
-                  'seconds' => new FloatAttribute(
-                    'â€™', _('Seconds'),
-                    $ldapName.'_long_seconds', FALSE,
-                    0, 59.999, ''
-                  ),
-                  'dir' => new SelectAttribute(
-                    '', _('East/West'),
-                    $ldapName.'_long_direction', TRUE,
-                    array('E', 'W'), '',
-                    array(_('East'), _('West'))
-                  ),
-                )
-              ),
-              'alt' => new FloatAttribute(
-                _('Altitude (meters)'), '',
-                $ldapName.'_altitude', TRUE,
-                -100000.00, 42849672.95, ''
-              ),
-              'size' => new FloatAttribute(
-                _('Size (meters)'), '',
-                $ldapName.'_size', FALSE,
-                0, 90000000, ''
-              ),
-              'hp' => new FloatAttribute(
-                _('Horizontal precision (meters)'), '',
-                $ldapName.'_hp', FALSE,
-                0, 90000000, ''
-              ),
-              'vp' => new FloatAttribute(
-                _('Vertical precision (meters)'), '',
-                $ldapName.'_vp', FALSE,
-                0, 90000000, ''
-              ),
-            )
-          );
+          $this->loadLocRecordFields($ldapName);
         break;
         case 'mXRecord':
           $this->attributes[1] = new CharSeparatedCompositeAttribute(
@@ -281,39 +353,7 @@ class DnsRecordAttribute extends CompositeAttribute
           );
         break;
         case 'nAPTRRecord':
-          $this->attributes[1] = new CharSeparatedCompositeAttribute(
-            _('NAPTR Record'),
-            $ldapName,
-            array(
-              new IntAttribute(
-                _('Order'), _('Integer specifying the order in which the NAPTR records MUST be processed to ensure the correct ordering of rules.  Low numbers are processed before high numbers.'),
-                $ldapName.'_order', TRUE,
-                0, FALSE
-              ),
-              new IntAttribute(
-                _('Preference'), _('Integer that specifies the order in which NAPTR records with equal "order" values SHOULD be processed, low numbers being processed before high numbers.'),
-                $ldapName.'_pref', TRUE,
-                0, FALSE
-              ),
-              new StringAttribute(
-                _('Flags'), _('Flags to control aspects of the rewriting and interpretation of the fields in the record. Flags are single characters from the set [A-Z0-9].  The case of the alphabetic characters is not significant.'),
-                $ldapName.'_flags', TRUE
-              ),
-              new StringAttribute(
-                _('Service'), _('Specifies the service(s) available down this rewrite path. It may also specify the particular protocol that is used to talk with a service. A protocol MUST be specified if the flags field states that the NAPTR is terminal.'),
-                $ldapName.'_service', TRUE
-              ),
-              new StringAttribute(
-                _('Regular Expression'), _('A STRING containing a substitution expression that is applied to the original string held by the client in order to construct the next domain name to lookup.'),
-                $ldapName.'_regexp', TRUE
-              ),
-              new StringAttribute(
-                _('Replacement'), _('The next NAME to query for NAPTR, SRV, or address records depending on the value of the flags field.'),
-                $ldapName.'_replace', TRUE
-              ),
-            ),
-            ' '
-          );
+          $this->loadNaptrRecordFields($ldapName);
         break;
         case 'nSRecord':
           $this->attributes[1] = new FQDNAttribute(
@@ -322,32 +362,7 @@ class DnsRecordAttribute extends CompositeAttribute
           );
         break;
         case 'sRVRecord':
-          $this->attributes[1] = new CharSeparatedCompositeAttribute(
-            _('SRV Record'),
-            $ldapName,
-            array(
-              new IntAttribute(
-                _('Priority'), _('Priority of the target host, lower value means more preferred'),
-                $ldapName.'_priority', TRUE,
-                0, FALSE
-              ),
-              new IntAttribute(
-                _('Weight'), _('Relative weight for records with the same priority, higher value means more preferred'),
-                $ldapName.'_weight', TRUE,
-                0, FALSE
-              ),
-              new IntAttribute(
-                _('Port'), _('TCP or UDP port on which the service is to be found'),
-                $ldapName.'_port', TRUE,
-                0, FALSE
-              ),
-              new StringAttribute(
-                _('Target'), _('Canonical hostname of the machine providing the service, ending in a dot'),
-                $ldapName.'_target', TRUE
-              ),
-            ),
-            ' '
-          );
+          $this->loadSrvRecordFields($ldapName);
         break;
         case 'sSHFPRecord':
           $this->attributes[1] = new StringAttribute(
@@ -372,7 +387,7 @@ class DnsRecordAttribute extends CompositeAttribute
         $this->attributes[2]->setVisible(FALSE);
       }
     }
-    /* Update ACLs */
+    // Update ACLs
     $this->setAttributes($this->attributes);
   }
 
diff --git a/dns/admin/dns/class_dnsManagement.inc b/dns/admin/dns/class_dnsManagement.inc
index ca24b6ea49001e7901a38ffc393a81762eddf562..ab4b2d7306586f85a05a65239361f4ebe24e997c 100644
--- a/dns/admin/dns/class_dnsManagement.inc
+++ b/dns/admin/dns/class_dnsManagement.inc
@@ -42,11 +42,6 @@ class dnsManagement extends simpleManagement
     );
   }
 
-  function __construct()
-  {
-    parent::__construct();
-  }
-
   function configureHeadpage ()
   {
     parent::configureHeadpage();
@@ -107,7 +102,7 @@ class dnsManagement extends simpleManagement
             );
           } else {
             $target = array($serverTabs->getBaseObject()->macAddress);
-            $res    = $s_daemon->append_call('Ldap2Zone.start', $target, array('args' => array($zoneName)));
+            $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 {
diff --git a/dns/admin/dns/class_dnsView.inc b/dns/admin/dns/class_dnsView.inc
index 8da010e05cd5e9c3afb07a2960b3adcf78a4e2f8..4488857b08bfefc8a0e3648b15db0e3bf2d7234c 100644
--- a/dns/admin/dns/class_dnsView.inc
+++ b/dns/admin/dns/class_dnsView.inc
@@ -80,6 +80,5 @@ class dnsView extends simplePlugin
     $acls = objects::ls('dnsAcl', 'cn');
     $this->attributesAccess['fdDNSViewMatchClientsAcl']->setChoices($acls);
     $this->attributesAccess['fdDNSViewMatchDestinationsAcl']->setChoices($acls);
-    $this->updateAttributesValues();
   }
 }
diff --git a/dns/admin/dns/class_dnsZone.inc b/dns/admin/dns/class_dnsZone.inc
index 074ccbefe3dbd1c1674f95f445ab2401519dbb1b..a4e02efddec748a6d7ca550a9d1560c7f438c9bc 100644
--- a/dns/admin/dns/class_dnsZone.inc
+++ b/dns/admin/dns/class_dnsZone.inc
@@ -73,7 +73,7 @@ class DnsRecordPlugin extends simplePlugin
 
     $types = DnsRecordAttribute::$types;
     foreach ($types as $id => $name) {
-      if (!preg_match('/w/', $this->getacl('dnsRecord_'.$id, $this->acl_skip_write()))) {
+      if (!preg_match('/w/', $this->aclGetPermissions('dnsRecord_'.$id, NULL, $this->acl_skip_write()))) {
         unset($types[$id]);
       }
     }
@@ -104,7 +104,7 @@ class DnsRecordPlugin extends simplePlugin
     $smarty = get_smarty();
     $attr   = $this->attributesAccess['dnsRecord'];
     foreach ($this->attributesAccess as $attr) {
-      $smarty->assign($attr->getAcl().'ACL', $this->getacl($attr->getAcl(), $this->acl_skip_write()));
+      $smarty->assign($attr->getAcl().'ACL', $this->aclGetPermissions($attr->getAcl(), NULL, $this->acl_skip_write()));
     }
     return parent::execute();
   }
@@ -241,7 +241,8 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
     }
     if (isset($attrs['dn'])) {
       $ldap = $config->get_ldap_link();
-      $ldap->ls('(&(objectClass=dNSZone)(zoneName='.$attrs['zoneName'][0].'))', $attrs['dn'], array_merge(array('relativeDomainName'), array_keys(DnsRecordAttribute::$types)));
+      $ldap->cd($attrs['dn']);
+      $ldap->search('(&(objectClass=dNSZone)(zoneName='.$attrs['zoneName'][0].'))', array_merge(array('relativeDomainName'), array_keys(DnsRecordAttribute::$types)), 'one');
       while ($subattrs = $ldap->fetch()) {
         for ($i = 0; $i < $subattrs['count']; $i++) {
           $type = $subattrs[$i];
@@ -262,7 +263,8 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
         }
       }
       /* Get reverse zone */
-      $ldap->ls('(&(objectClass=dNSZone)(relativeDomainName=@)(zoneName=*))', $attrs['dn'], array('zoneName'));
+      $ldap->cd($attrs['dn']);
+      $ldap->search('(&(objectClass=dNSZone)(relativeDomainName=@)(zoneName=*))', array('zoneName'), 'one');
       $reverseZones = array();
       while ($subattrs = $ldap->fetch()) {
         $reverseZones[$subattrs['dn']] = $subattrs['zoneName'][0];
@@ -286,14 +288,15 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
         } else {
           $baseIp = implode('.', array_reverse(explode('.', $baseIp)));
         }
-        $ldap->ls('(objectClass=dNSZone)', $reverseZoneDn, array('relativeDomainName', 'pTRRecord'));
+        $ldap->cd($reverseZoneDn);
+        $ldap->search('(objectClass=dNSZone)', array('relativeDomainName', 'pTRRecord'), 'one');
         while ($subattrs = $ldap->fetch()) {
           unset($subattrs['pTRRecord']['count']);
           foreach ($subattrs['pTRRecord'] as $ptrRecord) {
-            if ($ptrRecord == $attrs['zoneName'][0]) {
+            if (preg_match('/^'.preg_quote($attrs['zoneName'][0], '/').'\.?$/', $ptrRecord)) {
               $name = '@';
             } else {
-              $name = preg_replace('/\.'.preg_quote($attrs['zoneName'][0]).'$/', '', $ptrRecord);
+              $name = preg_replace('/\.'.preg_quote($attrs['zoneName'][0], '/').'\.?$/', '', $ptrRecord);
             }
             if ($ipv6) {
               $ip = $baseIp.':'.implode(':', array_map('implode', array_chunk(array_reverse(explode('.', $subattrs['relativeDomainName'][0])), 4)));
@@ -314,8 +317,6 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
 
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
     foreach (array_keys(DnsRecordAttribute::$types) as $type) {
       if (!isset($attrs[$type])) {
         $attrs[$type] = array();
@@ -336,7 +337,8 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
     $zoneDn   = $this->getZoneDn();
     $zoneName = $this->getZoneName();
     /* First delete all old nodes */
-    $ldap->ls('objectClass=dNSZone', $zoneDn, array('dn'));
+    $ldap->cd($zoneDn);
+    $ldap->search('objectClass=dNSZone', array('dn'), 'one');
     $delete = array();
     while ($attrs = $ldap->fetch()) {
       $delete[] = $attrs['dn'];
@@ -395,6 +397,10 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
       $this->reverseZones = $this->plugin->reverseZones;
       $this->sOARecord    = $this->plugin->sOARecord;
     }
+    $zoneNameWithFinalDot = $zoneName;
+    if (!preg_match('/\.$/', $zoneNameWithFinalDot)) {
+      $zoneNameWithFinalDot .= '.';
+    }
     foreach ($this->reverseZones as $reverseZone) {
       /* Write this reverse under the zone dn */
       $reverseDn = 'zoneName='.$reverseZone.','.$zoneDn;
@@ -436,8 +442,8 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
               'zoneName'            => $reverseZone,
               'dNSClass'            => 'IN',
               'pTRRecord'           => array_map(
-                function ($name) use ($zoneName) {
-                  return (empty($name) ? '' : $name.'.').$zoneName;
+                function ($name) use ($zoneNameWithFinalDot) {
+                  return (empty($name) ? '' : $name.'.').$zoneNameWithFinalDot;
                 },
                 $names
               ),
@@ -490,7 +496,7 @@ class DnsRecordsAttribute extends DialogOrderedArrayAttribute
   protected function canWriteRecord($value)
   {
     $ui     = get_userinfo();
-    $rights = $ui->get_permissions($this->getZoneDn(), 'dnsZone/DnsRecordPlugin', 'dnsRecord_'.$value[1], $this->plugin->read_only);
+    $rights = $ui->get_permissions($this->getZoneDn(), 'dnsZone/DnsRecordPlugin', 'dnsRecord_'.$value[1], $this->plugin->readOnly());
     return preg_match('/w/', $rights);
   }
 
@@ -610,7 +616,7 @@ class dnsZone extends simplePlugin
               ),
               new DisplayLDAPAttribute(
                 _('Serial number'), _('Version number of the original copy of the zone'),
-                'soaRecord_serial', TRUE,
+                'soaRecord_serial', FALSE,
                 0, FALSE, date('Ymd').'01'
               ),
               new TimeAttribute(
@@ -656,7 +662,6 @@ class dnsZone extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
     $this->attributesAccess['reverseZones']->setInLdap(FALSE);
-    $this->updateAttributesValues();
   }
 
   function prepareSavedAttributes()
@@ -671,8 +676,10 @@ class dnsZone extends simplePlugin
 
   function prepare_save ()
   {
+    /* Update serial (Also thanks to this save is triggered if something changed - see simplePlugin::shouldSave) */
     if (
       $this->attributesAccess['zoneName']->hasChanged() ||
+      $this->attributesAccess['sOARecord']->hasChanged() ||
       $this->attributesAccess['reverseZones']->hasChanged() ||
       $this->attributesAccess['sOARecord']->hasChanged() ||
       $this->attributesAccess['dnsRecords']->hasChanged()
@@ -688,10 +695,10 @@ class dnsZone extends simplePlugin
     parent::prepare_save();
   }
 
-  function ldap_save ($cleanup = TRUE)
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     if (
       $this->attributesAccess['zoneName']->hasChanged() ||
       $this->attributesAccess['reverseZones']->hasChanged() ||
@@ -699,6 +706,7 @@ class dnsZone extends simplePlugin
       ) {
       $this->attributesAccess['dnsRecords']->postLdapSave($config->get_ldap_link());
     }
+    return $errors;
   }
 
   function cnChanged ($oldcn, $newcn)
diff --git a/dns/admin/systems/class_dnsHost.inc b/dns/admin/systems/class_dnsHost.inc
index b798a4476c2cb49829248198bfd0e7c0d2e2d4cd..3ebde31f10b69ca083ed567d71a8edf356f86d48 100644
--- a/dns/admin/systems/class_dnsHost.inc
+++ b/dns/admin/systems/class_dnsHost.inc
@@ -87,15 +87,12 @@ class DnsRecordsFilteredAttribute extends DnsRecordsAttribute
 
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
     if ($this->plugin->is_template) {
       $attrs[$this->getLdapName()] = array_map(function ($v) {return implode('|', $v);}, $this->value);
     }
   }
 
   /* Special LDAP treatment that this attribute does after plugin ldap save */
-  /* FIXME - We should lock the zone object and check if we donâ€™t erase changes */
   function postLdapSave ($ldap)
   {
     if ($this->plugin->is_template) {
@@ -122,7 +119,7 @@ class dnsHost extends simplePlugin
       'plDescription'   => _('Edit the DNS zones of a system'),
       'plIcon'          => 'geticon.php?context=applications&icon=dns&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=dns&size=16',
-      'plObjectType'    => array('server','workstation','terminal','printer','component','winstation','phone','mobilePhone'),
+      'plObjectType'    => array('server','workstation','terminal','printer','component','phone','mobilePhone'),
       'plPriority'      => 5,
       'plForeignKeys'  => array(
         'fdDNSZoneDn' => 'dnsZone'
@@ -193,11 +190,13 @@ class dnsHost extends simplePlugin
     $ldap     = $config->get_ldap_link();
     $dnsZones = $this->fdDNSZoneDn;
     /* Removes references to old attributes */
-    foreach (array_keys($this->attributesInfo['records']['attrs']) as $oldattr) {
-      unset($this->attributesAccess[$oldattr]);
-    }
-    foreach (array_keys($this->attributesInfo['soa']['attrs']) as $oldattr) {
-      unset($this->attributesAccess[$oldattr]);
+    if (isset($this->attributesInfo['soa'])) {
+      foreach (array_keys($this->attributesInfo['records']['attrs']) as $oldattr) {
+        $this->removeAttribute('records', $oldattr);
+      }
+      foreach (array_keys($this->attributesInfo['soa']['attrs']) as $oldattr) {
+        $this->removeAttribute('soa', $oldattr);
+      }
     }
     /* Remove sections or fill them */
     if (empty($dnsZones)) {
@@ -230,14 +229,14 @@ class dnsHost extends simplePlugin
           continue;
         }
         $attrId = 'zoneRecords'.$zoneid;
-        $this->attributesInfo['records']['attrs'][$attrId] = new DnsRecordsFilteredAttribute(
-          $name, sprintf(_('The DNS records for zone "%s"'), $name),
-          $attrId, $dn,
-          array(), 'dnsRecords'
+        $this->addAttribute(
+          'records',
+          new DnsRecordsFilteredAttribute(
+            $name, sprintf(_('The DNS records for zone "%s"'), $name),
+            $attrId, $dn,
+            array(), 'dnsRecords'
+          )
         );
-        $this->attributesAccess[$attrId] =& $this->attributesInfo['records']['attrs'][$attrId];
-        $this->attributesAccess[$attrId]->setParent($this);
-        unset($this->$attrId);
 
         /* Fetch SOA record */
         $ldap->cat($dn);
@@ -251,19 +250,18 @@ class dnsHost extends simplePlugin
             }
           }
           $attrId = 'soaRecord'.$zoneid;
-          $this->attributesInfo['soa']['attrs'][$attrId] = new DisplayAttribute(
-            $name, sprintf(_('The primary server for zone "%s"'), $name),
-            $attrId, FALSE,
-            $fqdn
+          $this->addAttribute(
+            'soa',
+            new DisplayAttribute(
+              $name, sprintf(_('The primary server for zone "%s"'), $name),
+              $attrId, FALSE,
+              $fqdn
+            )
           );
           $this->attributesInfo['soa']['attrs'][$attrId]->setAllowHTML(TRUE);
-          $this->attributesAccess[$attrId] =& $this->attributesInfo['soa']['attrs'][$attrId];
-          $this->attributesAccess[$attrId]->setParent($this);
-          unset($this->$attrId);
         }
       }
     }
-    $this->updateAttributesValues();
   }
 
   function load()
@@ -277,10 +275,9 @@ class dnsHost extends simplePlugin
   function execute()
   {
     $this->load();
-    $smarty     = get_smarty();
-    $ui         = get_userinfo();
-    $skip_write = $this->read_only;
-    $acl        = $ui->get_permissions($this->acl_base, 'dnsZone/dnsZone', 'dnsRecords', $this->read_only);
+    $smarty = get_smarty();
+    $ui     = get_userinfo();
+    $acl    = $ui->get_permissions($this->acl_base, 'dnsZone/dnsZone', 'dnsRecords', $this->read_only);
     $smarty->assign('dnsRecordsACL', $acl);
     return parent::execute();
   }
@@ -300,7 +297,7 @@ class dnsHost extends simplePlugin
               );
             } else {
               $target = array($this->parent->getBaseObject()->macAddress);
-              $res    = $s_daemon->append_call('Ldap2Zone.start', $target, array('args' => array($zone)));
+              $s_daemon->append_call('Ldap2Zone.start', $target, array('args' => array($zone)));
               if ($s_daemon->is_error()) {
                 msg_dialog::display(_('Could not run ldap2zone'), msgPool::siError($s_daemon->get_error()), ERROR_DIALOG);
               } else {
@@ -318,7 +315,7 @@ class dnsHost extends simplePlugin
   function save()
   {
     global $config;
-    parent::save();
+    $errors = parent::save();
     foreach ($this->attributesInfo['records']['attrs'] as &$attr) {
       if ($attr->hasChanged()) {
         $attr->postLdapSave($config->get_ldap_link());
@@ -385,6 +382,8 @@ class dnsHost extends simplePlugin
         msg_dialog::display(_('DNS update'), $message, INFO_DIALOG);
       }
     }
+
+    return $errors;
   }
 
   function adapt_from_template($attrs, $skip = array())
@@ -398,4 +397,18 @@ class dnsHost extends simplePlugin
       unset($attr);
     }
   }
+
+  /* Record example: array('host', 'aRecord', '192.168.1.1', '')
+   * Fields are relativeDomainName, record type, record content, reverse zone (for a/aaaa) */
+  function addRecord($zoneDn, array $record)
+  {
+    if (isset($this->zonesCache[$zoneDn])) {
+      $name   = $this->zonesCache[$zoneDn];
+      $zoneid = preg_replace('/[\/\-,.#:; =]/', '_', $zoneDn);
+    } else {
+      return FALSE;
+    }
+    $attrId = 'zoneRecords'.$zoneid;
+    $this->attributesAccess[$attrId]->addValue($record);
+  }
 }
diff --git a/dns/locale/ar/fusiondirectory.po b/dns/locale/ar/fusiondirectory.po
index 54b38b49670c1bf00a94fef2c7f1de15c6cc455f..a7e318d5f02c72702a772468c7fecf0fbc0bfa83 100644
--- a/dns/locale/ar/fusiondirectory.po
+++ b/dns/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/ca/fusiondirectory.po b/dns/locale/ca/fusiondirectory.po
index 5e829e10e5bcb2209e96613cc788d07b8345e8f9..7435d215ce992d3ca28d6f5bd4110ec2002dcbef 100644
--- a/dns/locale/ca/fusiondirectory.po
+++ b/dns/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "AdreÃ§a de correu"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/cs_CZ/fusiondirectory.po b/dns/locale/cs_CZ/fusiondirectory.po
index 6ae9b73064036e5abc358cab4d290729fe038b1b..d5e4bf37ed4e547709876cc225a494e15de07a62 100644
--- a/dns/locale/cs_CZ/fusiondirectory.po
+++ b/dns/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: config/dns/class_dnsConfig.inc:28
 msgid "DNS configuration"
-msgstr "NastavenÃ DNS"
+msgstr "nastavenÃ DNS"
 
 #: config/dns/class_dnsConfig.inc:29
 msgid "FusionDirectory dns plugin configuration"
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "DNS zÃ³ny"
 
@@ -117,7 +117,7 @@ msgstr "DNS zÃ³ny"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -127,40 +127,40 @@ msgstr ""
 
 #: admin/dns/class_dnsManagement.inc:37
 msgid "Systems"
-msgstr "SystÃ©my"
+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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -173,162 +173,125 @@ msgstr ""
 
 #: admin/dns/class_DnsRecordAttribute.inc:130
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: admin/dns/class_DnsRecordAttribute.inc:133
 msgid "Reverse zone"
-msgstr "ObrÃ¡cenÃ¡ zÃ³na"
+msgstr "obrÃ¡cenÃ¡ zÃ³na"
 
 #: admin/dns/class_DnsRecordAttribute.inc:133
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "CÃl"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "minuty"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Priorita"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "PÅ™Ãznaky"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
-msgstr "SluÅ¾ba"
+msgstr "sluÅ¾by"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -336,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "priorita"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "cÃl"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "PÅ™esmÄ›rovat na"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
-msgstr "Obsah"
+msgstr "obsah"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "DNS zÃ³na"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "ZÃ³na"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
-msgstr "NÃ¡zev zÃ³ny"
+msgstr "nÃ¡zev zÃ³ny"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "SOA zÃ¡znam"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
-msgstr "E-mailovÃ¡ adresa"
+msgstr "e-mailovÃ¡ adresa"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
-msgstr "Obnovit"
+msgstr "obnovit"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
-msgstr "Znovu"
+msgstr "znovu"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
-msgstr "Platnost skonÄÃ"
+msgstr "vyprÅ¡Ã"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/de/fusiondirectory.po b/dns/locale/de/fusiondirectory.po
index 8c647df8a4a53fe212d7a6bacdbfbf2e73f4fc16..2bdac427c3a6b4f9f54c131179220ca2a9a4120d 100644
--- a/dns/locale/de/fusiondirectory.po
+++ b/dns/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "DNS-Zonen"
 
@@ -117,7 +117,7 @@ msgstr "DNS-Zonen"
 msgid "DNS zones in this view"
 msgstr "DNS-Zonen in dieser Ansicht"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +129,38 @@ msgstr "DNS-Verwaltung"
 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -183,152 +183,115 @@ msgstr "Reverse Zone"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Ziel"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr "Eine IPv4-Adresse"
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr "Eine IPv6-Adresse"
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr "LOC-Eintrag"
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minuten"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr "Sekunden"
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr "Nord/SÃ¼d"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr "Nord"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr "SÃ¼d"
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr "LÃ¤ngengrad"
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr "Ost/West"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr "Ost"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr "West"
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr "HÃ¶he (Meter)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr "GrÃ¶ÃŸe (Meter)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr "Horizontale Genauigkeit (Meter)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr "Vertikale Genauigkeit (Meter)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr "MX-Eintrag"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "PrioritÃ¤t"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr "NAPTR-Eintrag"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr "Auftrag"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr "PrÃ¤ferenz"
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Dienst"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -336,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr "RegulÃ¤rer Ausdruck"
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr "SRV-Eintrag"
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "PrioritÃ¤t"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr "Gewicht"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Anschluss"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Ziel"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr "Eine IPv4-Adresse"
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr "Eine IPv6-Adresse"
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr "MX-Eintrag"
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr "Eintrag"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Umleiten zu"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Inhalt"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr "Inhalt dieses Eintrags"
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -450,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr "DNS-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "DNS-Zone"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "SOA-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr "SOA-Eintrag"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr "PrimÃ¤rer DNS-Server"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Ablauf"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr "EintrÃ¤ge"
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr "SOA-EintrÃ¤ge"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr "DNS-EintrÃ¤ge"
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr "PrimÃ¤re Server"
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "Die DNS-EintrÃ¤ge fÃ¼r Zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Der primÃ¤re Server fÃ¼r Zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/el_GR/fusiondirectory.po b/dns/locale/el_GR/fusiondirectory.po
index db332107d809773044a6a520e3d51cf450d0181c..a32646be08ddc7cf923904e150eb05cdb7e8d8c6 100644
--- a/dns/locale/el_GR/fusiondirectory.po
+++ b/dns/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -110,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "Î–ÏŽÎ½ÎµÏ‚ DNS"
 
@@ -118,7 +117,7 @@ msgstr "Î–ÏŽÎ½ÎµÏ‚ DNS"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -130,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -184,152 +183,115 @@ msgstr "Î‘Î½Ï„Î¯ÏƒÏ„ÏÎ¿Ï†Î· Î¶ÏŽÎ½Î·"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Î›ÎµÏ€Ï„Î¬"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Î£Î·Î¼Î¬Î½ÏƒÎµÎ¹Ï‚"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î±"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -337,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Î˜ÏÏÎ±"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Î‘Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ· ÏƒÎµ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -451,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Î–ÏŽÎ½Î· DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Î¶ÏŽÎ½Î·Ï‚"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Î•Î³Î³ÏÎ±Ï†Î® SOA "
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
-msgstr "Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
+msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Î‘Î½Î±Î½ÎÏ‰ÏƒÎ·"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Î ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î± Î¾Î±Î½Î¬"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Î›Î®Î¾Î·"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/en/fusiondirectory.po b/dns/locale/en/fusiondirectory.po
index ac216229d760960c2ffe6197ebea7f386d32cd4d..8d81d88fee9c5be7af90b908b414d6f1e58e38c7 100644
--- a/dns/locale/en/fusiondirectory.po
+++ b/dns/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +128,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,151 +182,114 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are "
-"preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the "
-"owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to "
 "ensure the correct ordering of rules.  Low numbers are processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\" "
 "values SHOULD be processed, low numbers being processed before high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -334,92 +297,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are "
+"preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the "
+"owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\", "
 "or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -448,168 +448,168 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final dot.<br/"
 "><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or x.x.ip6."
 "arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/es/fusiondirectory.po b/dns/locale/es/fusiondirectory.po
index ace76e84580f7100616794730da0e73a4f2241fb..1230793f0b06c921d5e8b2664c8a6932a51bdc91 100644
--- a/dns/locale/es/fusiondirectory.po
+++ b/dns/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "Zona Inversa"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Objetivo"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minutos"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Prioridad"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Servicio"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Prioridad"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Puerto"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Objetivo"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Registro SOA"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "ExpiraciÃ³n"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/es_CO/fusiondirectory.po b/dns/locale/es_CO/fusiondirectory.po
index cd5d78b32948e73661c11fdaab6e1524c396c72b..65fba4e122d55169d0c090ff774ad3f996af8167 100644
--- a/dns/locale/es_CO/fusiondirectory.po
+++ b/dns/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Puerto"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/es_VE/fusiondirectory.po b/dns/locale/es_VE/fusiondirectory.po
index cfd1c3125305d5ab579e9afdabba3333dc2b816f..6489ec3d227a9366210fedf67c1dd0c58e22d6c1 100644
--- a/dns/locale/es_VE/fusiondirectory.po
+++ b/dns/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Error"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "Zona Inversa"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Objetivo"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minutos"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Prioridad"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Servicio"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Prioridad"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Puerto"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Objetivo"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Registro SOA"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "DirecciÃ³n correo electrÃ³nico"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "ExpiraciÃ³n"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/fa_IR/fusiondirectory.po b/dns/locale/fa_IR/fusiondirectory.po
index 0d4556d981795adf9de38d00f357d94ffa418bd3..8286285e53e94ad6e9945334f28127ada38306ed 100644
--- a/dns/locale/fa_IR/fusiondirectory.po
+++ b/dns/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/fi_FI/fusiondirectory.po b/dns/locale/fi_FI/fusiondirectory.po
index 3244c720e3bb2f788da4fc7407f8326316d63df7..fa9599b5c41bc94e0fd888aa2e8bd41f5b189095 100644
--- a/dns/locale/fi_FI/fusiondirectory.po
+++ b/dns/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "MÃ¤Ã¤rÃ¤npÃ¤Ã¤"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Portti"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "MÃ¤Ã¤rÃ¤npÃ¤Ã¤"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/fr/fusiondirectory.po b/dns/locale/fr/fusiondirectory.po
index 340d0370c30e23ae743f8f5e8f943df29ada1ef7..e5d995de9ba30fc0aa40976d9f5651184a1bf7ac 100644
--- a/dns/locale/fr/fusiondirectory.po
+++ b/dns/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2017
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 15:46+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +44,9 @@ msgstr "Stocker le point final dans les domaines"
 
 #: config/dns/class_dnsConfig.inc:50
 msgid "Should FD store a final dot at the end of domains?"
-msgstr "Est ce que FusionDirectory doit stocker un point final Ã  la fin des domainesâ€¯?"
+msgstr ""
+"Est ce que FusionDirectory doit stocker un point final Ã  la fin des domaines"
+"â€¯?"
 
 #: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
 #: admin/dns/class_dnsAcl.inc:33
@@ -96,7 +97,8 @@ msgstr "Match clients ACL"
 #: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
-msgstr "Nom de l'ACL Ã  utiliser pour l'adresse IP source des requÃªtes entrantes"
+msgstr ""
+"Nom de l'ACL Ã  utiliser pour l'adresse IP source des requÃªtes entrantes"
 
 #: admin/dns/class_dnsView.inc:57
 msgid "Match destinations ACL"
@@ -110,7 +112,7 @@ msgstr "Match recursive only"
 msgid "Match only recursive queries in this view"
 msgstr "Accepter uniquement les requÃªtes rÃ©cursives dans cette vue"
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "Zones DNS"
 
@@ -118,7 +120,7 @@ msgstr "Zones DNS"
 msgid "DNS zones in this view"
 msgstr "zones DNS dans cette vue"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -130,47 +132,50 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr "Impossible de lancer ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr "Plus d'un serveur correspond au SOA"
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr "Impossible de trouver le serveur primaire"
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr "Impossible de lancer ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr "Ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, 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:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Le client Argonaut doit Ãªtre activÃ© pour utiliser ldap2zone Ã  distance"
+msgstr ""
+"Le client Argonaut doit Ãªtre activÃ© pour utiliser ldap2zone Ã  distance"
 
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
 "\"%s\" must contain a fully qualified domain name in lowercase and end with "
 "a final dot.<br/><br/>Example: dns1.example.com."
-msgstr "\"%s\" doit contenir un nom de domaine complet en minuscule et se terminer par un point final.<br/><br/> Exemple : dns1.exemple.com."
+msgstr ""
+"\"%s\" doit contenir un nom de domaine complet en minuscule et se terminer "
+"par un point final.<br/><br/> Exemple : dns1.exemple.com."
 
 #: admin/dns/class_DnsRecordAttribute.inc:130
 msgid "Type"
@@ -184,245 +189,276 @@ msgstr "Zone inverse"
 msgid "Reverse zone this record should be in, if any"
 msgstr "zone inverse cet enregistrement devrait Ãªtre dans, le cas Ã©chÃ©ant"
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Cible"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr "Une adresse IPv4"
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr "Une adresse IPv6"
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr "enregistrement LOC "
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr "Latitude"
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr "DegrÃ©s"
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minutes"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr "Secondes"
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr "Nord/Sud"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr "Nord"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr "Sud"
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr "Longitude"
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr "Est/Ouest"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr "Est"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr "Ouest"
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr "Altitude (mÃ¨tres)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr "Taille (mÃ¨tres)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr "PrÃ©cision horizontale (mÃ¨tres)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr "PrÃ©cision verticale (mÃ¨tres)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr "enregistrement MX"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "PrioritÃ©"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr "PrÃ©fÃ©rence donnÃ©e Ã  ce RR entre autres du mÃªme propriÃ©taire, les valeurs plus basses sont prÃ©fÃ©rÃ©es"
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr "Nom de domaine qui spÃ©cifie un hÃ´te prÃªt Ã  agir comme un Ã©change de courrier pour le domaine spÃ©cifie"
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr "Enregistrement NAPTR "
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr "Ordre"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
-msgstr "Entier spÃ©cifiant l'ordre dans lequel les enregistrements NAPTR doivent Ãªtre traitÃ©es pour assurer l' ordre appropriÃ©e des rÃ¨gles. Les petits nombres sont traitÃ©s avant les grand nombre."
+msgstr ""
+"Entier spÃ©cifiant l'ordre dans lequel les enregistrements NAPTR doivent Ãªtre"
+" traitÃ©es pour assurer l' ordre appropriÃ©e des rÃ¨gles. Les petits nombres "
+"sont traitÃ©s avant les grand nombre."
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr "PrÃ©fÃ©rence"
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
-msgstr "Entier qui spÃ©cifie l'ordre dans lequel les enregistrements NAPTR  dont les valeurs \"ordre\" sont Ã©gaux doivent Ãªtre traitÃ©es, Les petits nombres sont traitÃ©s avant les grand nombre."
+msgstr ""
+"Entier qui spÃ©cifie l'ordre dans lequel les enregistrements NAPTR  dont les "
+"valeurs \"ordre\" sont Ã©gaux doivent Ãªtre traitÃ©es, Les petits nombres sont "
+"traitÃ©s avant les grand nombre."
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Drapeaux"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
-msgstr "Drapeaux pour contrÃ´ler les aspects de la rÃ©Ã©criture et l'interprÃ©tation des champs de l'enregistrement. Les drapeaux sont des caractÃ¨res uniques de l'ensemble [A-Z0-9]. Le cas des caractÃ¨res alphabÃ©tiques est non significatif."
+msgstr ""
+"Drapeaux pour contrÃ´ler les aspects de la rÃ©Ã©criture et l'interprÃ©tation des"
+" champs de l'enregistrement. Les drapeaux sont des caractÃ¨res uniques de "
+"l'ensemble [A-Z0-9]. Le cas des caractÃ¨res alphabÃ©tiques est non "
+"significatif."
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Service"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
 "protocol MUST be specified if the flags field states that the NAPTR is "
 "terminal."
-msgstr "Indique les services) disponibles dans cette voie de rÃ©Ã©criture. Il peut Ã©galement spÃ©cifier le protocole particulier qui est utilisÃ© pour parler avec un service. Un protocole doit Ãªtre spÃ©cifiÃ© si le drapeaux indique que le NAPTR est terminal."
+msgstr ""
+"Indique les services) disponibles dans cette voie de rÃ©Ã©criture. Il peut "
+"Ã©galement spÃ©cifier le protocole particulier qui est utilisÃ© pour parler "
+"avec un service. Un protocole doit Ãªtre spÃ©cifiÃ© si le drapeaux indique que "
+"le NAPTR est terminal."
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr "Expression rÃ©guliÃ¨re"
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
-msgstr "Une chaÃ®ne contenant une expression de substitution qui est appliquÃ© Ã  la chaÃ®ne d'origine dÃ©tenu par le client afin de construire le prochain nom de domaine a rechercher."
+msgstr ""
+"Une chaÃ®ne contenant une expression de substitution qui est appliquÃ© Ã  la "
+"chaÃ®ne d'origine dÃ©tenu par le client afin de construire le prochain nom de "
+"domaine a rechercher."
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr "Remplacement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
-msgstr "La prochaine NOM pour interroger pour NAPTR, SRV, ou des enregistrements d'adresses en fonction de la valeur du drapeaux."
-
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr "Nom de domaine qui spÃ©cifie un hÃ´te qui doit faire autoritÃ© pour la classe et le domaine spÃ©cifiÃ©s"
+msgstr ""
+"La prochaine NOM pour interroger pour NAPTR, SRV, ou des enregistrements "
+"d'adresses en fonction de la valeur du drapeaux."
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr "enregistrement SRV"
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "PrioritÃ©"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr "PrioritÃ© de l'hÃ´te cible, valeur infÃ©rieure signifie prÃ©fÃ©rÃ©"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr "Poids"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
-msgstr "poids relatif des enregistrements avec la mÃªme prioritÃ©, valeur plus Ã©levÃ©e signifie prÃ©fÃ©rÃ©"
+msgstr ""
+"poids relatif des enregistrements avec la mÃªme prioritÃ©, valeur plus Ã©levÃ©e "
+"signifie prÃ©fÃ©rÃ©"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Port"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr "Port TCP ou UDP sur lequel le service se trouve"
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Cible"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
-msgstr "nom canonique de la machine qui fournit le service, se terminant par un point"
+msgstr ""
+"nom canonique de la machine qui fournit le service, se terminant par un "
+"point"
+
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr "Une adresse IPv4"
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr "Une adresse IPv6"
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr "enregistrement MX"
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+"PrÃ©fÃ©rence donnÃ©e Ã  ce RR entre autres du mÃªme propriÃ©taire, les valeurs "
+"plus basses sont prÃ©fÃ©rÃ©es"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+"Nom de domaine qui spÃ©cifie un hÃ´te prÃªt Ã  agir comme un Ã©change de courrier"
+" pour le domaine spÃ©cifie"
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+"Nom de domaine qui spÃ©cifie un hÃ´te qui doit faire autoritÃ© pour la classe "
+"et le domaine spÃ©cifiÃ©s"
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr "Enregistrement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
-msgstr "SSHFP contenu de l'enregistrement. Peut Ãªtre obtenu en utilisant \"ssh-keygen -R some.host.tld\", ou la commande sshfp"
+msgstr ""
+"SSHFP contenu de l'enregistrement. Peut Ãªtre obtenu en utilisant \"ssh-"
+"keygen -R some.host.tld\", ou la commande sshfp"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Rediriger vers"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr "Domaine dont ce sous-domaine est un alias"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Contenu"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr "Contenu de cet enregistrement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 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"
 
@@ -451,172 +487,187 @@ msgstr "Relative nom de sous-domaine"
 msgid "DNS Record"
 msgstr "Enregistrement DNS"
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
-msgstr "\"%s\" doit contenir un nom de domaine en minuscule et se terminer par un point final.<br/><br/> Exemple:. Exemple.com."
+msgstr ""
+"\"%s\" doit contenir un nom de domaine en minuscule et se terminer par un "
+"point final.<br/><br/> Exemple:. Exemple.com."
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
-msgstr "\"%s\" doit contenir un nom de domaine en minuscule.<br/><br/> Exemple: exemple.com"
+msgstr ""
+"\"%s\" doit contenir un nom de domaine en minuscule.<br/><br/> Exemple: "
+"exemple.com"
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Zone DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nom de la zone"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr "Zones inverses"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
-msgstr "Zones inverse pour cette zone sous la forme xx.xx.in-addr.arpa%1$s ou x.x.ip6.arpa%1$s"
+msgstr ""
+"Zones inverse pour cette zone sous la forme xx.xx.in-addr.arpa%1$s ou "
+"x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Enregistrement SOA"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr "Enregistrement SOA"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr "Serveur DNS primaire"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
-msgstr "Nom de domaine du serveur de noms qui a Ã©tÃ© la source d'origine ou primaire de donnÃ©es pour cette zone"
+msgstr ""
+"Nom de domaine du serveur de noms qui a Ã©tÃ© la source d'origine ou primaire "
+"de donnÃ©es pour cette zone"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
-msgstr "Courriel"
+msgstr "Adresse de messagerie"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
-msgstr "Nom de domaine qui spÃ©cifie la boÃ®te aux lettres de la personne responsable de cette zone"
+msgstr ""
+"Nom de domaine qui spÃ©cifie la boÃ®te aux lettres de la personne responsable "
+"de cette zone"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr "NumÃ©ro de sÃ©rie"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr "NumÃ©ro de version de la copie originale de la zone"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "RafraÃ®chir"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr "intervalle de temps avant que la zone doive Ãªtre rafraÃ®chie"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "RÃ©essayer"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
-msgstr "intervalle de temps qui devrait s'Ã©couler avant qu'un rafraÃ®chissement dÃ©fectueux doive Ãªtre retentÃ©"
+msgstr ""
+"intervalle de temps qui devrait s'Ã©couler avant qu'un rafraÃ®chissement "
+"dÃ©fectueux doive Ãªtre retentÃ©"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Expirer"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
-msgstr "La valeur du temps qui spÃ©cifie la limite supÃ©rieure de l'intervalle de temps qui peut s'Ã©couler avant que la zone ne soit plus autoritaire"
+msgstr ""
+"La valeur du temps qui spÃ©cifie la limite supÃ©rieure de l'intervalle de "
+"temps qui peut s'Ã©couler avant que la zone ne soit plus autoritaire"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr "champ TTL minimum qui doit Ãªtre exportÃ© avec un RR de cette zone"
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr "Enregistrements"
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr "Les enregistrements DNS pour cette zone"
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr "Modifier les zones DNS d'un systÃ¨me"
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr "zones DNS pour cet hÃ´te"
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr "enregistrements SOA"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr "enregistrements DNS"
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr "Serveurs primaires"
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "Les enregistrements DNS pour la zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Le serveur principal pour la zone \"%s\""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
-msgstr "%d enregistrements ont Ã©tÃ© mis Ã  jour Ã  partir de %s vers %s dans la zone %s"
+msgstr ""
+"%d enregistrements ont Ã©tÃ© mis Ã  jour Ã  partir de %s vers %s dans la zone %s"
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d enregistrements ont Ã©tÃ© enlevÃ©s dans la zone %s"
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr "mise Ã  jour DNS"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
-msgstr "Permissions insuffisantes"
+msgstr "Droits insuffisants"
diff --git a/dns/locale/hu_HU/fusiondirectory.po b/dns/locale/hu_HU/fusiondirectory.po
index a8ffa40360ca8e94fa65f49ba6186171539a7fa3..6f3edece478a56c9a41168ea59868ed213b02fc4 100644
--- a/dns/locale/hu_HU/fusiondirectory.po
+++ b/dns/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +128,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +182,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +298,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +449,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/id/fusiondirectory.po b/dns/locale/id/fusiondirectory.po
index 6b519be75970d31b8710c9cd75195e2d6c1a9038..9d3353b38ce138a9c0ce57263b8eb724cb36589c 100644
--- a/dns/locale/id/fusiondirectory.po
+++ b/dns/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +128,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +182,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +298,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +449,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/it_IT/fusiondirectory.po b/dns/locale/it_IT/fusiondirectory.po
index 17b520645167fc92e0e396975a4b3e54a0fc05f3..cee44bf784b11c5c5f43144745fd5428a7be988a 100644
--- a/dns/locale/it_IT/fusiondirectory.po
+++ b/dns/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016-2017
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 14:28+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -97,7 +95,9 @@ msgstr "Abbinamento cliente ACL"
 #: admin/dns/class_dnsView.inc:53 admin/dns/class_dnsView.inc:57
 msgid ""
 "Name of the ACL to use for the source IP address of the incoming requests"
-msgstr "Nome della ACL da utilizzare per l' indirizzo IP di origine delle richieste in arrivo"
+msgstr ""
+"Nome della ACL da utilizzare per l' indirizzo IP di origine delle richieste "
+"in arrivo"
 
 #: admin/dns/class_dnsView.inc:57
 msgid "Match destinations ACL"
@@ -111,7 +111,7 @@ msgstr "Abbinamento query ricorsive"
 msgid "Match only recursive queries in this view"
 msgstr "Abbinare solo le query ricorsive in questa vista"
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "Zone DNS"
 
@@ -119,7 +119,7 @@ msgstr "Zone DNS"
 msgid "DNS zones in this view"
 msgstr "Zone DNS in questa vista"
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -131,47 +131,50 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr "Impossibile eseguire ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr "PiÃ¹ di un server corrisponde al SOA"
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr "Impossibile trovare il server primario"
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr "Impossibile ottenere run ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr "Zona LDAP2"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, 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:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Errore"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
-msgstr "Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
+msgstr ""
+"Il cliente Argonaut dev'essere attivato per utilizzare ldap2zone a distanza"
 
 #: admin/dns/class_DnsRecordAttribute.inc:27
 #, php-format
 msgid ""
 "\"%s\" must contain a fully qualified domain name in lowercase and end with "
 "a final dot.<br/><br/>Example: dns1.example.com."
-msgstr "\"%s\" deve contenere un nome di dominio pienamente qualificato in caratteri minuscoli e finire con un punto. <br/><br/> Esempio: dns1.example.com."
+msgstr ""
+"\"%s\" deve contenere un nome di dominio pienamente qualificato in caratteri"
+" minuscoli e finire con un punto. <br/><br/> Esempio: dns1.example.com."
 
 #: admin/dns/class_DnsRecordAttribute.inc:130
 msgid "Type"
@@ -185,245 +188,278 @@ msgstr "Zona inversa"
 msgid "Reverse zone this record should be in, if any"
 msgstr "Zona inversa nella quale dovrebbe trovarsi questo record, se ce n'Ã©"
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Obiettivo"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr "Un indirizzo IPv4"
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr "Un indirizzo IPv6"
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr "Record LOC"
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr "Latitudine"
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr "Gradi"
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minuti"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr "Secondi"
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr "Nord/Sud"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr "Nord"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr "Sud"
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr "Longitudine"
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr "Est/Ovest"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr "Est"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr "Ovest"
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr "Altitudine (in metri)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr "Taglia (in metri)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr "Precisione orizzontale (in metri)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr "Precisione verticale (in metri)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr "Record MX"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "PrioritÃ "
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr "Preferenza data a questo RR tra gli altri allo stesso proprietario, valori piÃ¹ bassi sono preferiti."
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr "Nome a dominio che specifica la volontÃ  di un host ad agire come uno scambio di posta per il nome del proprietario"
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr "Record NAPTR"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr "Ordine"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
-msgstr "Integer che specifica l'ordine in cui i record NAPTR devono essere trattati per assicurare il corretto ordine delle regole. I numeri bassi vengono elaborati prima dei numeri alti ."
+msgstr ""
+"Integer che specifica l'ordine in cui i record NAPTR devono essere trattati "
+"per assicurare il corretto ordine delle regole. I numeri bassi vengono "
+"elaborati prima dei numeri alti ."
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr "Preferenza"
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
-msgstr "Integer che specifica l'ordine in cui i record NAPTR con uguali valori di \"ordine\" dovrebbero essere trattati, i numeri bassi vengono elaborati prima dei numeri alti."
+msgstr ""
+"Integer che specifica l'ordine in cui i record NAPTR con uguali valori di "
+"\"ordine\" dovrebbero essere trattati, i numeri bassi vengono elaborati "
+"prima dei numeri alti."
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
-msgstr "Flags per controllare gli aspetti della riscrittura e l'interpretazione dei campi del record. I flags sono singoli caratteri dal set [A - Z0-9 ]. Il caso dei caratteri alfabetici non Ã¨ significativo."
+msgstr ""
+"Flags per controllare gli aspetti della riscrittura e l'interpretazione dei "
+"campi del record. I flags sono singoli caratteri dal set [A - Z0-9 ]. Il "
+"caso dei caratteri alfabetici non Ã¨ significativo."
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Servizi"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
 "protocol MUST be specified if the flags field states that the NAPTR is "
 "terminal."
-msgstr "Specifica il servizio ( i ) disponibile su questo path di riscrittura . PuÃ² anche specificare il particolare protocollo utilizzato per comunicare con un servizio . Un protocollo DEVE essere specificato se il campo flags afferma che il NAPTR Ã¨ terminale."
+msgstr ""
+"Specifica il servizio ( i ) disponibile su questo path di riscrittura . PuÃ² "
+"anche specificare il particolare protocollo utilizzato per comunicare con un"
+" servizio . Un protocollo DEVE essere specificato se il campo flags afferma "
+"che il NAPTR Ã¨ terminale."
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr "Espressione regolare"
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
-msgstr "Stringa che contiene un'espressione di sostituzione che viene applicato alla stringa originale conservata dal cliente al fine di costruire il prossimo nome di dominio da ricercare."
+msgstr ""
+"Stringa che contiene un'espressione di sostituzione che viene applicato alla"
+" stringa originale conservata dal cliente al fine di costruire il prossimo "
+"nome di dominio da ricercare."
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr "Sostituzione"
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
-msgstr "Il successivo NOME di query per NAPTR , SRV , o record di indirizzo in base al valore del campo flags . "
-
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr "Nome di dominio che specifica un host che dovrebbe essere autorevole per la classe e il dominio specificati"
+msgstr ""
+"Il successivo NOME di query per NAPTR , SRV , o record di indirizzo in base "
+"al valore del campo flags . "
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr "Record SRV"
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "PrioritÃ "
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
-msgstr "La prioritÃ  del l'host di destinazione, il valore piÃ¹ basso significa piÃ¹ preferito"
+msgstr ""
+"La prioritÃ  del l'host di destinazione, il valore piÃ¹ basso significa piÃ¹ "
+"preferito"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr "Peso"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
-msgstr "Peso relativo per i record con la stessa prioritÃ  , il valore piÃ¹ alto significa piÃ¹ preferito"
+msgstr ""
+"Peso relativo per i record con la stessa prioritÃ  , il valore piÃ¹ alto "
+"significa piÃ¹ preferito"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Porta"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr "Port TCP o UDP sui quali i servizi devono essere trovati"
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Obiettivo"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
-msgstr "Hostname canonico della macchina che fornisce il servizio, che termina con un punto"
+msgstr ""
+"Hostname canonico della macchina che fornisce il servizio, che termina con "
+"un punto"
+
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr "Un indirizzo IPv4"
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr "Un indirizzo IPv6"
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr "Record MX"
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+"Preferenza data a questo RR tra gli altri allo stesso proprietario, valori "
+"piÃ¹ bassi sono preferiti."
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+"Nome a dominio che specifica la volontÃ  di un host ad agire come uno scambio"
+" di posta per il nome del proprietario"
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+"Nome di dominio che specifica un host che dovrebbe essere autorevole per la "
+"classe e il dominio specificati"
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr "Record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
-msgstr "Contenuto record SSHFP. Puo' essere ottenuto usando \"ssh-keygen -r some.host.tld\", or sshfp command for instance, o per esempio il comando sshfp"
+msgstr ""
+"Contenuto record SSHFP. Puo' essere ottenuto usando \"ssh-keygen -r "
+"some.host.tld\", or sshfp command for instance, o per esempio il comando "
+"sshfp"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Reindirizzare verso"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr "Dominio di cui questo sottodominio Ã© un alias"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Contenuto"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr "Contenuto di questo record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "L'IP immesso non corrisponde alla zona inversa selezionata"
 
@@ -452,169 +488,184 @@ msgstr "Nome relativo di sottodominio"
 msgid "DNS Record"
 msgstr "Record DNS"
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
-msgstr "\"%s\" deve contenere un nome di dominio in caratteri minuscoli e terminare con un punto finale.<br/>Esempio: example.com."
+msgstr ""
+"\"%s\" deve contenere un nome di dominio in caratteri minuscoli e terminare "
+"con un punto finale.<br/>Esempio: example.com."
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
-msgstr "%s\" deve contenere un nome di dominio in minuscolo.<br/><br/>Esempio: esempio.com"
+msgstr ""
+"%s\" deve contenere un nome di dominio in minuscolo.<br/><br/>Esempio: "
+"esempio.com"
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nome della zona"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr "Zone inverse"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
-msgstr "Zone inverse per questa zona in forma xx.xx.in-addr.arpa%1$s or x.x.ip6.arpa%1$s"
+msgstr ""
+"Zone inverse per questa zona in forma xx.xx.in-addr.arpa%1$s or "
+"x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Record SOA"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr "Record SOA"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr "Server DNS primario"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
-msgstr "Nome di dominio del server che Ã¨ stato la fonte originale o primaria dei dati per questa zona"
+msgstr ""
+"Nome di dominio del server che Ã¨ stato la fonte originale o primaria dei "
+"dati per questa zona"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "Indirizzo di posta elettronica"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
-msgstr "Nome di dominio che specifica la mailbox della persona responsabile di questa zona"
+msgstr ""
+"Nome di dominio che specifica la mailbox della persona responsabile di "
+"questa zona"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr "Numero di serie"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr "Numero di versione della copia originale della zona"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr "Intervallo di tempo prima che la zona venga aggiornata"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Riprova"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
-msgstr "Intervallo di tempo che deve trascorrere prima che un aggiornamento fallito venga ritentato"
+msgstr ""
+"Intervallo di tempo che deve trascorrere prima che un aggiornamento fallito "
+"venga ritentato"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Scadenza"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
-msgstr "Valore temporale che specifica il limite superiore dell'intervallo di tempo che puÃ² trascorrere prima che la zona non sia piÃ¹ autorevole"
+msgstr ""
+"Valore temporale che specifica il limite superiore dell'intervallo di tempo "
+"che puÃ² trascorrere prima che la zona non sia piÃ¹ autorevole"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
-msgstr "Campo minimo TTL che deve essere esportato con qualsiasi RR da questa zona"
+msgstr ""
+"Campo minimo TTL che deve essere esportato con qualsiasi RR da questa zona"
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr "Records"
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr "Records DNS per questa zona"
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr "Modificare le zone DNS di un sistema"
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr "Zone DNS per questo host"
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr "Record SOA"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr "Records DNS"
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr "Servers primari"
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "Records DNS par la zona \"%s\""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "Server primario per la zona \"%s\""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr "%d records sono stati aggiornati da %s a %s nella zona %s"
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d records sono stati rimossi nella zona %s"
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr "Aggiornamento DNS"
 
diff --git a/dns/locale/lv/fusiondirectory.po b/dns/locale/lv/fusiondirectory.po
index 1ce47297a96fd99610de70f5f014a022d778674a..c8a582327f3f9962af0c5e54562caa401041bd4d 100644
--- a/dns/locale/lv/fusiondirectory.po
+++ b/dns/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "NovirzÄ«t uz"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP kÄ¼Å«da"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "E-pasta adrese"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/nb/fusiondirectory.po b/dns/locale/nb/fusiondirectory.po
index 382bcfffb74756767c08f9f5894f6034182137b2..b0f0a84ed2bf5a8ea09025fa6db0bbef2250458b 100644
--- a/dns/locale/nb/fusiondirectory.po
+++ b/dns/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Feil"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/nl/fusiondirectory.po b/dns/locale/nl/fusiondirectory.po
index 0bc8d197056d69f76618de4c19a77678fb7210c2..ba0050fd2022c94ac9cde251e6f64579617c09d8 100644
--- a/dns/locale/nl/fusiondirectory.po
+++ b/dns/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,15 +24,15 @@ msgstr "DNS configuratie"
 
 #: config/dns/class_dnsConfig.inc:29
 msgid "FusionDirectory dns plugin configuration"
-msgstr ""
+msgstr "FusionDirectory dns plugin configuratie"
 
 #: config/dns/class_dnsConfig.inc:42
 msgid "DNS config"
-msgstr ""
+msgstr "DNS configuratie"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "DNS RDN"
-msgstr ""
+msgstr "DNS RDN"
 
 #: config/dns/class_dnsConfig.inc:45
 msgid "Branch in which DNS zones will be stored"
@@ -48,19 +49,19 @@ msgstr ""
 #: admin/dns/class_dnsAcl.inc:30 admin/dns/class_dnsAcl.inc:31
 #: admin/dns/class_dnsAcl.inc:33
 msgid "DNS acl"
-msgstr ""
+msgstr "DNS ACL"
 
 #: admin/dns/class_dnsAcl.inc:47
 msgid "Acl"
-msgstr ""
+msgstr "ACL"
 
 #: admin/dns/class_dnsAcl.inc:51
 msgid "ACL name"
-msgstr ""
+msgstr "ACL naam"
 
 #: admin/dns/class_dnsAcl.inc:51
 msgid "Name of this acl"
-msgstr ""
+msgstr "Naam van deze ACL"
 
 #: admin/dns/class_dnsAcl.inc:56
 msgid "Address match list"
@@ -68,7 +69,7 @@ msgstr ""
 
 #: admin/dns/class_dnsAcl.inc:56
 msgid "The ip address match list for this acl"
-msgstr ""
+msgstr "IP-adres komt overeen met de lijst van de ACL"
 
 #: admin/dns/class_dnsView.inc:28 admin/dns/class_dnsView.inc:29
 #: admin/dns/class_dnsView.inc:31
@@ -108,15 +109,15 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
-msgstr ""
+msgstr "DNS zones"
 
 #: 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
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
-msgstr ""
+msgstr "Meer dan Ã©Ã©n server komt overeen met de SOA"
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
-msgstr ""
+msgstr "Kan de primaire server niet vinden"
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
-msgstr ""
+msgstr "LDAP2zone"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Fout"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "Reverse zone"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Doel"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
-msgstr ""
+msgstr "Graden"
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minuten"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
-msgstr ""
+msgstr "Seconden"
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
-msgstr ""
+msgstr "Noord/zuid"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
-msgstr ""
+msgstr "Noord"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
-msgstr ""
+msgstr "Zuid"
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
-msgstr ""
+msgstr "Oost/west"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
-msgstr ""
+msgstr "Oost"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
-msgstr ""
+msgstr "West"
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Prioriteit"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
-msgstr ""
+msgstr "Bestelling"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Dienst"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,107 +299,144 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
-msgstr ""
+msgstr "Reguliere expressie"
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
-msgstr ""
+msgstr "SRV record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Poort"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Doel"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr "Een IPv4 adres"
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr "Een IPv6 adres"
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr "MX record"
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
-msgstr ""
+msgstr "Record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Doorsturen naar"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Inhoud"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
-msgstr ""
+msgstr "Inhoud van de record"
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
 #: admin/dns/class_dnsZone.inc:27
 msgid "DNS Record domain and type"
-msgstr ""
+msgstr "DNS record domein en type"
 
 #: admin/dns/class_dnsZone.inc:30
 #, php-format
 msgid "%s record"
-msgstr ""
+msgstr "%s record"
 
 #: admin/dns/class_dnsZone.inc:34 admin/dns/class_dnsZone.inc:35
 msgid "DNS record"
-msgstr ""
+msgstr "DNS record"
 
 #: admin/dns/class_dnsZone.inc:49
 msgid "Subdomain"
@@ -447,174 +448,176 @@ msgstr ""
 
 #: admin/dns/class_dnsZone.inc:54
 msgid "DNS Record"
-msgstr ""
+msgstr "DNS record"
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "DNZ zone"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Zone-naam"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "SOA record"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
-msgstr ""
+msgstr "SOA record"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
+"Domein naam dat specifiek is voor de mailbox van de persoon die "
+"verantwoordelijk is voor deze zone"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
-msgstr ""
+msgstr "Serienummer"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Ververs"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Vervaltijd"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
-msgstr ""
+msgstr "Records"
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
-msgstr ""
+msgstr "De DNS records voor deze zone"
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
-msgstr ""
+msgstr "SOA records"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
-msgstr ""
+msgstr "DNS records"
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
-msgstr ""
+msgstr "DNS update"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Onvoldoende rechten"
diff --git a/dns/locale/pl/fusiondirectory.po b/dns/locale/pl/fusiondirectory.po
index 803d1831a650709046336e4c3b54e4bddfec70fa..9215e8c038eef69e6e7ff8a9deaf6206e2e16273 100644
--- a/dns/locale/pl/fusiondirectory.po
+++ b/dns/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "Strefa odwrotna"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Priorytet"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "UsÅ‚uga"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Priorytet"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Port"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Strefa"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "Rekord SOA"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "Adres email"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "OdÅ›wieÅ¼"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Ponawia"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Wygasa"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/pt/fusiondirectory.po b/dns/locale/pt/fusiondirectory.po
index ce5d23b61c78bf7d8366ee788ddcd25dbd698885..2d68d6575369cd7cba7ec7123a968cd0774ca28e 100644
--- a/dns/locale/pt/fusiondirectory.po
+++ b/dns/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "EndereÃ§o de Correio"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Recarregar"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/pt_BR/fusiondirectory.po b/dns/locale/pt_BR/fusiondirectory.po
index bf14eab8b88db0d0fc02e2fffbf1f60516c46b3f..ffb3f7fe46c3243c5012c46980d0bcde990e6751 100644
--- a/dns/locale/pt_BR/fusiondirectory.po
+++ b/dns/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Erro"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "Zona reversa"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr "Destino"
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "Minutos"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Bandeiras"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
-msgstr ""
+msgstr "ServiÃ§o"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Porta"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr "Destino"
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Redirecionar para"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "ConteÃºdo"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "Zona DNS"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Nome da zona"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "E-mail"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Tente novamente"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/ru/fusiondirectory.po b/dns/locale/ru/fusiondirectory.po
index 1e440fcc88ccce709a49f535138ce97b6fd4b5b0..7e7ccfbe24aa7a63581c69e71cb074f02aa8a133 100644
--- a/dns/locale/ru/fusiondirectory.po
+++ b/dns/locale/ru/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr "Ð—Ð¾Ð½Ñ‹ DNS"
 
@@ -117,7 +117,7 @@ msgstr "Ð—Ð¾Ð½Ñ‹ DNS"
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr "DNS"
 
@@ -129,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr "Ldap2zone"
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -183,152 +183,124 @@ msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð·Ð¾Ð½Ð°"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr "IPv4 Ð°Ð´Ñ€ÐµÑÑ"
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr "IPv6 Ð°Ð´Ñ€ÐµÑÑ"
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr "LOC Ð—Ð°Ð¿Ð¸ÑÑŒ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr "Ð¨Ð¸Ñ€Ð¾Ñ‚Ð°"
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr "ÐœÐ¸Ð½ÑƒÑ‚Ñ‹"
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr "Ð¡ÐµÐºÑƒÐ½Ð´Ñ‹"
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr "Ð¡ÐµÐ²ÐµÑ€/Ð®Ð³"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr "Ð¡ÐµÐ²ÐµÑ€"
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr "Ð®Ð³"
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr "Ð”Ð¾Ð»Ð³Ð¾Ñ‚Ð¾Ñ‚Ð°"
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr "Ð’Ð¾ÑÑ‚Ð¾Ðº/Ð—Ð°Ð¿Ð°Ð´"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr "Ð’Ð¾ÑÑ‚Ð¾Ðº"
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr "Ð—Ð°Ð¿Ð°Ð´"
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr "Ð’Ñ‹ÑÐ¾Ñ‚Ð° (Ð² Ð¼ÐµÑ‚Ñ€Ð°Ñ…)"
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr "MX Ð·Ð°Ð¿Ð¸ÑÐ¸"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "ÐŸÑ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr "NAPTR Ð—Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr "Order"
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
-msgstr "Ð¦ÐµÐ»Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð·Ð°Ð´Ð°ÑŽÑ‰ÐµÐµ Ð¿Ð¾Ñ€ÑÐ´Ð¾Ðº Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð”ÐžÐ›Ð–ÐÐ« Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒÑÑ NAPTR Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð´Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐ¿Ð¾Ñ€ÑÐ´Ð¾Ñ‡ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ñ€Ð°Ð²Ð¸Ð». Ð£Ð¿Ð¾Ñ€ÑÐ´Ð¾Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¸Ð´ÐµÑ‚ Ð¾Ñ‚ Ð¼ÐµÐ½ÑŒÑˆÐ¸Ñ… Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ Ðº Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼."
+msgstr ""
+"Ð¦ÐµÐ»Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð·Ð°Ð´Ð°ÑŽÑ‰ÐµÐµ Ð¿Ð¾Ñ€ÑÐ´Ð¾Ðº Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð”ÐžÐ›Ð–ÐÐ« Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒÑÑ NAPTR Ð·Ð°Ð¿Ð¸ÑÐ¸ "
+"Ð´Ð»Ñ Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐ¿Ð¾Ñ€ÑÐ´Ð¾Ñ‡ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð¿Ñ€Ð°Ð²Ð¸Ð». Ð£Ð¿Ð¾Ñ€ÑÐ´Ð¾Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¸Ð´ÐµÑ‚ "
+"Ð¾Ñ‚ Ð¼ÐµÐ½ÑŒÑˆÐ¸Ñ… Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ Ðº Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼."
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr "Preference"
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
-msgstr "Ð¦ÐµÐ»Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð·Ð°Ð´Ð°ÐµÑ‚ Ð¿Ð¾Ñ€ÑÐ´Ð¾Ðº, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÐ¸ NAPTR Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼Ð¸ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑÐ¼Ð¸ Ð¿Ð¾Ð»ÐµÐ¹ \"order\". ÐœÐ»Ð°Ð´ÑˆÐ¸Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð° Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ Ñ€Ð°Ð½ÑŒÑˆÐµ ÑÑ‚Ð°Ñ€ÑˆÐ¸Ñ…."
+msgstr ""
+"Ð¦ÐµÐ»Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð·Ð°Ð´Ð°ÐµÑ‚ Ð¿Ð¾Ñ€ÑÐ´Ð¾Ðº, Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑÐ»ÐµÐ´ÑƒÐµÑ‚ Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÐ¸ "
+"NAPTR Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼Ð¸ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑÐ¼Ð¸ Ð¿Ð¾Ð»ÐµÐ¹ \"order\". ÐœÐ»Ð°Ð´ÑˆÐ¸Ðµ Ð½Ð¾Ð¼ÐµÑ€Ð° "
+"Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÑŽÑ‚ÑÑ Ñ€Ð°Ð½ÑŒÑˆÐµ ÑÑ‚Ð°Ñ€ÑˆÐ¸Ñ…."
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr "Flags"
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
-msgstr "Ð¤Ð»Ð°Ð³Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€ÑƒÑŽÑ‚ Ð°ÑÐ¿ÐµÐºÑ‚Ñ‹ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚Ð°Ñ†Ð¸Ð¸ Ð¿Ð¾Ð»ÐµÐ¹ Ð² Ð·Ð°Ð¿Ð¸ÑÐ¸. Ð¤Ð»Ð°Ð³Ð¸ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÑÑŽÑ‚ ÑÐ¾Ð±Ð¾Ð¹ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð¸Ð· Ð½Ð°Ð±Ð¾Ñ€Ð° [A-Z0-9]. Ð ÐµÐ³Ð¸ÑÑ‚Ñ€ Ð±ÑƒÐºÐ² Ð²Ð¾ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ðµ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ÑÑ."
+msgstr ""
+"Ð¤Ð»Ð°Ð³Ð¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€ÑƒÑŽÑ‚ Ð°ÑÐ¿ÐµÐºÑ‚Ñ‹ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸ÑÐ¸ Ð¸ Ð¸Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚Ð°Ñ†Ð¸Ð¸ Ð¿Ð¾Ð»ÐµÐ¹ Ð² Ð·Ð°Ð¿Ð¸ÑÐ¸. Ð¤Ð»Ð°Ð³Ð¸ "
+"Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÑÑŽÑ‚ ÑÐ¾Ð±Ð¾Ð¹ Ð¾Ð´Ð¸Ð½Ð¾Ñ‡Ð½Ñ‹Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ‹ Ð¸Ð· Ð½Ð°Ð±Ð¾Ñ€Ð° [A-Z0-9]. Ð ÐµÐ³Ð¸ÑÑ‚Ñ€ Ð±ÑƒÐºÐ² Ð²Ð¾ "
+"Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ Ð½Ðµ Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°ÐµÑ‚ÑÑ."
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr "Service"
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -336,92 +308,141 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr "Regular Expression"
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
-msgstr "Ð¡Ñ‚Ñ€Ð¾ÐºÐ°, ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð°Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð·Ð°Ð¼ÐµÐ½Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÐµÑ‚ÑÑ Ðº Ð¸ÑÑ…Ð¾Ð´Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð¾ÐºÐµ, ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÐµÐ¼Ð¾Ð¹ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð¼ Ð´Ð»Ñ ÐºÐ¾Ð½ÑÑ‚Ñ€ÑƒÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ð¸ÑÐºÐ¾Ð¼Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸."
+msgstr ""
+"Ð¡Ñ‚Ñ€Ð¾ÐºÐ°, ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ñ‰Ð°Ñ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð·Ð°Ð¼ÐµÐ½Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÑÐµÑ‚ÑÑ Ðº Ð¸ÑÑ…Ð¾Ð´Ð½Ð¾Ð¹ "
+"ÑÑ‚Ñ€Ð¾ÐºÐµ, ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÐµÐ¼Ð¾Ð¹ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð¼ Ð´Ð»Ñ ÐºÐ¾Ð½ÑÑ‚Ñ€ÑƒÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ³Ð¾ Ð¸ÑÐºÐ¾Ð¼Ð¾Ð³Ð¾ "
+"Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð¸Ð¼ÐµÐ½Ð¸."
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr "Replacement"
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
-msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐÐÐ—Ð’ÐÐÐ˜Ð•, Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÐ¼Ð¾Ðµ Ð´Ð»Ñ NAPTR, SRV, Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑÐ° Ð·Ð°Ð¿Ð¸ÑÐµÐ¹, Ð·Ð°Ð²Ð¸ÑÐ¸Ñ‚ Ð¾Ñ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ñ Ñ„Ð»Ð°Ð³Ð¾Ð²."
-
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr "Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ñ…Ð¾ÑÑ‚, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¼ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐ° Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°"
+msgstr ""
+"Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ ÐÐÐ—Ð’ÐÐÐ˜Ð•, Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÐ¼Ð¾Ðµ Ð´Ð»Ñ NAPTR, SRV, Ð¸Ð»Ð¸ Ð°Ð´Ñ€ÐµÑÐ° Ð·Ð°Ð¿Ð¸ÑÐµÐ¹, "
+"Ð·Ð°Ð²Ð¸ÑÐ¸Ñ‚ Ð¾Ñ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ñ Ñ„Ð»Ð°Ð³Ð¾Ð²."
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr "SRV Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "ÐŸÑ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr "Ð’ÐµÑ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
-msgstr "ÐžÑ‚Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð²ÐµÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼, Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ðµ Ð¾Ñ‚Ð´Ð°ÐµÑ‚ÑÑ Ðº Ð±Ð¾Ð»ÐµÐµ Ð²Ñ‹ÑÐ¾ÐºÐ¾Ð¼Ñƒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑŽ"
+msgstr ""
+"ÐžÑ‚Ð½Ð¾ÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð²ÐµÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼ Ð¿Ñ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚Ð¾Ð¼, Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ðµ Ð¾Ñ‚Ð´Ð°ÐµÑ‚ÑÑ Ðº "
+"Ð±Ð¾Ð»ÐµÐµ Ð²Ñ‹ÑÐ¾ÐºÐ¾Ð¼Ñƒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ÑŽ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "ÐŸÐ¾Ñ€Ñ‚"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr "TCP Ð¸Ð»Ð¸ UDP Ð¿Ð¾Ñ€Ñ‚ Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑÐ»ÑƒÐ¶Ð±Ð° Ð´Ð¾Ð»Ð¶Ð½Ð° Ð±Ñ‹Ñ‚ÑŒ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°"
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
-msgstr "ÐšÐ°Ð½Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ Ð¸Ð¼Ñ Ñ…Ð¾ÑÑ‚Ð° Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÑŽÑ‰ÐµÐ¹ ÑÐ»ÑƒÐ¶Ð±Ñƒ, Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ñ‚Ð¾Ñ‡ÐºÐ¾Ð¹."
+msgstr ""
+"ÐšÐ°Ð½Ð¾Ð½Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ Ð¸Ð¼Ñ Ñ…Ð¾ÑÑ‚Ð° Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÑÑŽÑ‰ÐµÐ¹ ÑÐ»ÑƒÐ¶Ð±Ñƒ, Ð·Ð°ÐºÐ°Ð½Ñ‡Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ñ‚Ð¾Ñ‡ÐºÐ¾Ð¹."
+
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr "IPv4 Ð°Ð´Ñ€ÐµÑÑ"
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr "IPv6 Ð°Ð´Ñ€ÐµÑÑ"
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr "MX Ð·Ð°Ð¿Ð¸ÑÐ¸"
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+"Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ñ…Ð¾ÑÑ‚, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¼ "
+"Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ ÐºÐ»Ð°ÑÑÐ° Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr "Ð—Ð°Ð¿Ð¸ÑÑŒ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
-msgstr "Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ SSHFP. ÐœÐ¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¾ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ \"ssh-keygen -r some.host.tld\", Ð¸Ð»Ð¸ sshfp ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€"
+msgstr ""
+"Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ SSHFP. ÐœÐ¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¾ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ \"ssh-keygen -r "
+"some.host.tld\", Ð¸Ð»Ð¸ sshfp ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÑƒÐ´Ð°"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr "Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr "Ð’Ð²ÐµÐ´ÐµÐ½Ð½Ñ‹Ð¹ IP Ð½Ðµ ÑÐ¾Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð±Ñ€Ð°Ñ‚Ð½Ð¾Ð¹ Ð·Ð¾Ð½Ðµ"
 
@@ -450,172 +471,182 @@ msgstr ""
 msgid "DNS Record"
 msgstr "DNS Ð·Ð°Ð¿Ð¸ÑÑŒ"
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr " DNZ Ð·Ð¾Ð½Ð°"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Ð—Ð¾Ð½Ð°"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "Ð˜Ð¼Ñ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ñ‹Ðµ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
-msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ñ‹Ðµ Ð·Ð¾Ð½Ñ‹ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ Ð² Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ðµ xx.xx.in-addr.arpa%1$s Ð¸Ð»Ð¸ x.x.ip6.arpa%1$s"
+msgstr ""
+"ÐžÐ±Ñ€Ð°Ñ‚Ð½Ñ‹Ðµ Ð·Ð¾Ð½Ñ‹ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ Ð² Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ðµ xx.xx.in-addr.arpa%1$s Ð¸Ð»Ð¸ x.x.ip6.arpa%1$s"
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "SOA Ð·Ð°Ð¿Ð¸ÑÑŒ"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr "SOA Ð—Ð°Ð¿Ð¸ÑÑŒ"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr "ÐŸÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¹ DNS ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
-msgstr "Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð¸Ð¼ÐµÐ½, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ñ‹Ð¼ Ð¸Ð»Ð¸ Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¼ Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ¾Ð¼ Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹"
+msgstr ""
+"Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð¸Ð¼ÐµÐ½, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð½Ð°Ñ‡Ð°Ð»ÑŒÐ½Ñ‹Ð¼ Ð¸Ð»Ð¸ Ð¿ÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¼ Ð¸ÑÑ‚Ð¾Ñ‡Ð½Ð¸ÐºÐ¾Ð¼ "
+"Ð´Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
-msgstr "Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÑ‰Ð¸Ðº - Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð·Ð° ÑÑ‚Ñƒ Ð·Ð¾Ð½Ñƒ"
+msgstr ""
+"Ð”Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÑ‰Ð¸Ðº - Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ° Ð¾Ñ‚Ð²ÐµÑ‚ÑÑ‚Ð²ÐµÐ½Ð½Ð¾Ð³Ð¾ "
+"Ð·Ð° ÑÑ‚Ñƒ Ð·Ð¾Ð½Ñƒ"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr "Serial number"
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr "ÐÐ¾Ð¼ÐµÑ€ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½ÐµÐ¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ð¼Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Refresh"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿Ð¾ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð·Ð¾Ð½Ð° Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "Retry"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿Ð¾ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð¾ÑˆÐ¸Ð±ÐºÐ¸"
+msgstr ""
+"Ð’Ñ€ÐµÐ¼Ñ Ð¿Ð¾ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð¾ÑÐ»Ðµ Ð¾ÑˆÐ¸Ð±ÐºÐ¸"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "Expire"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
-msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸, Ð¿Ð¾ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð·Ð¾Ð½Ð° Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ "
+msgstr ""
+"Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¸, Ð¿Ð¾ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð·Ð¾Ð½Ð° Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚"
+" Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ð°Ñ‚Ð¸Ð²Ð½Ð¾Ð¹ "
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
-msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»Ñ TTL, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ RR Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹"
+msgstr ""
+"ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð»Ñ TTL, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð±ÑƒÐ´ÐµÑ‚ ÑÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ RR Ð´Ð»Ñ "
+"ÑÑ‚Ð¾Ð¹ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr "Ð—Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr "DNS Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð·Ð¾Ð½Ñ‹"
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ DNS Ð·Ð¾Ð½Ñ‹ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr "DNS Ð·Ð¾Ð½Ñ‹ Ñ…Ð¾ÑÑ‚Ð°"
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr "SOA Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr "DNS Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr "ÐŸÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr "DNS Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ \"%s\""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr "ÐŸÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ \"%s\""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr "ÐšÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… Ñ %s Ð½Ð° %s Ð² Ð·Ð¾Ð½Ðµ %s - %d"
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr "%d Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ð±Ñ‹Ð»Ð¾ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾ Ð² Ð·Ð¾Ð½Ðµ %s"
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ DNS"
 
 #: admin/systems/dnsrecords.tpl.c:2
 msgid "Insufficient rights"
-msgstr "Ð½ÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ñ€Ð°Ð²"
+msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð¿Ñ€Ð°Ð²"
diff --git a/dns/locale/ru@petr1708/fusiondirectory.po b/dns/locale/ru@petr1708/fusiondirectory.po
index a33ee421a46f4206e75cac444ecc06d5432189cf..0cdcf887dec2a21d0d13788d13d5ddfa06f88d2f 100644
--- a/dns/locale/ru@petr1708/fusiondirectory.po
+++ b/dns/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +128,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +182,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +298,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +449,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/sv/fusiondirectory.po b/dns/locale/sv/fusiondirectory.po
index 6f922476c1890b05f32e0761bb503d01d6aec0d1..a07b6810b06f02c4edd12cf5205d2f40e143f209 100644
--- a/dns/locale/sv/fusiondirectory.po
+++ b/dns/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Fel"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "Prioritet"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "Prioritet"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "Port"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr "Omdirigera till"
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr "InnehÃ¥ll"
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr "DNS-zon"
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "Epostadress"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/ug/fusiondirectory.po b/dns/locale/ug/fusiondirectory.po
index 0e43fcc00e582078b434b731d1c5eb5d65850d58..7d70fabb0ed9cb40fb7506b6ba0640447e809747 100644
--- a/dns/locale/ug/fusiondirectory.po
+++ b/dns/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +128,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +182,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +298,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +449,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/vi_VN/fusiondirectory.po b/dns/locale/vi_VN/fusiondirectory.po
index 465db32f870f33b89e4fd23d8c2019c7499375e7..9b91681dd53ccdb1c19632ca8e5cdee5a50b8000 100644
--- a/dns/locale/vi_VN/fusiondirectory.po
+++ b/dns/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr ""
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
+#: admin/dns/class_DnsRecordAttribute.inc:287
+msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:326
-msgid "SRV Record"
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "Äá»‹a chá»‰ thÆ°"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dns/locale/zh/fusiondirectory.po b/dns/locale/zh/fusiondirectory.po
index 222f495ca9f89e709d06bac0eb9914425773f7c0..b7dc99bffdaaed1da16d60288c0b5007ae1289ba 100644
--- a/dns/locale/zh/fusiondirectory.po
+++ b/dns/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 07:31+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgstr ""
 msgid "Match only recursive queries in this view"
 msgstr ""
 
-#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:139
+#: admin/dns/class_dnsView.inc:66 admin/systems/class_dnsHost.inc:136
 msgid "DNS zones"
 msgstr ""
 
@@ -116,7 +117,7 @@ msgstr ""
 msgid "DNS zones in this view"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:121
+#: admin/dns/class_dnsManagement.inc:34 admin/systems/class_dnsHost.inc:118
 msgid "DNS"
 msgstr ""
 
@@ -128,38 +129,38 @@ 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:299
-#: admin/systems/class_dnsHost.inc:305
+#: admin/dns/class_dnsManagement.inc:93 admin/dns/class_dnsManagement.inc:95
+#: admin/dns/class_dnsManagement.inc:101 admin/systems/class_dnsHost.inc:296
+#: admin/systems/class_dnsHost.inc:302
 msgid "Could not run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:98
+#: admin/dns/class_dnsManagement.inc:93
 msgid "More than one server matches the SOA"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:100
+#: admin/dns/class_dnsManagement.inc:95
 msgid "Could not find the primary server"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:112
+#: admin/dns/class_dnsManagement.inc:107
 msgid "Could not get run ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 msgid "Ldap2zone"
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:114 admin/systems/class_dnsHost.inc:307
+#: admin/dns/class_dnsManagement.inc:109 admin/systems/class_dnsHost.inc:304
 #, php-format
 msgid "Ldap2Zone called for zone \"%s\""
 msgstr ""
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/dns/class_dnsManagement.inc:118 admin/systems/class_dnsHost.inc:311
+#: admin/dns/class_dnsManagement.inc:113 admin/systems/class_dnsHost.inc:308
 msgid "Argonaut client needs to be activated to use ldap2zone remotely"
 msgstr ""
 
@@ -182,152 +183,115 @@ msgstr "åå‘è§£æžåŸŸ"
 msgid "Reverse zone this record should be in, if any"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:171
-#: admin/dns/class_DnsRecordAttribute.inc:178
-#: admin/dns/class_DnsRecordAttribute.inc:276
-#: admin/dns/class_DnsRecordAttribute.inc:320
-#: admin/dns/class_DnsRecordAttribute.inc:345
-msgid "Target"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:171
-msgid "An IPv4 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:178
-msgid "An IPv6 address"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:185
+#: admin/dns/class_DnsRecordAttribute.inc:166
 msgid "LOC Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:189
+#: admin/dns/class_DnsRecordAttribute.inc:170
 msgid "Latitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:193
-#: admin/dns/class_DnsRecordAttribute.inc:220
+#: admin/dns/class_DnsRecordAttribute.inc:174
+#: admin/dns/class_DnsRecordAttribute.inc:201
 msgid "Degrees"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:198
-#: admin/dns/class_DnsRecordAttribute.inc:225
+#: admin/dns/class_DnsRecordAttribute.inc:179
+#: admin/dns/class_DnsRecordAttribute.inc:206
 msgid "Minutes"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:203
-#: admin/dns/class_DnsRecordAttribute.inc:230
+#: admin/dns/class_DnsRecordAttribute.inc:184
+#: admin/dns/class_DnsRecordAttribute.inc:211
 msgid "Seconds"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:208
+#: admin/dns/class_DnsRecordAttribute.inc:189
 msgid "North/South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "North"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:211
+#: admin/dns/class_DnsRecordAttribute.inc:192
 msgid "South"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:216
+#: admin/dns/class_DnsRecordAttribute.inc:197
 msgid "Longitude"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:235
+#: admin/dns/class_DnsRecordAttribute.inc:216
 msgid "East/West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "East"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:238
+#: admin/dns/class_DnsRecordAttribute.inc:219
 msgid "West"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:243
+#: admin/dns/class_DnsRecordAttribute.inc:224
 msgid "Altitude (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:248
+#: admin/dns/class_DnsRecordAttribute.inc:229
 msgid "Size (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:253
+#: admin/dns/class_DnsRecordAttribute.inc:234
 msgid "Horizontal precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:258
+#: admin/dns/class_DnsRecordAttribute.inc:239
 msgid "Vertical precision (meters)"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:267
-msgid "MX Record"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-#: admin/dns/class_DnsRecordAttribute.inc:330
-msgid "Priority"
-msgstr "ä¼˜å…ˆçº§"
-
-#: admin/dns/class_DnsRecordAttribute.inc:271
-msgid ""
-"Preference given to this RR among others at the same owner, lower values are"
-" preferred"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:276
-msgid ""
-"Domain name which specifies a host willing to act as a mail exchange for the"
-" owner name"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:285
+#: admin/dns/class_DnsRecordAttribute.inc:250
 msgid "NAPTR Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid "Order"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:289
+#: admin/dns/class_DnsRecordAttribute.inc:254
 msgid ""
 "Integer specifying the order in which the NAPTR records MUST be processed to"
 " ensure the correct ordering of rules.  Low numbers are processed before "
 "high numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid "Preference"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:294
+#: admin/dns/class_DnsRecordAttribute.inc:259
 msgid ""
 "Integer that specifies the order in which NAPTR records with equal \"order\""
 " values SHOULD be processed, low numbers being processed before high "
 "numbers."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid "Flags"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:299
+#: admin/dns/class_DnsRecordAttribute.inc:264
 msgid ""
 "Flags to control aspects of the rewriting and interpretation of the fields "
 "in the record. Flags are single characters from the set [A-Z0-9].  The case "
 "of the alphabetic characters is not significant."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid "Service"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:303
+#: admin/dns/class_DnsRecordAttribute.inc:268
 msgid ""
 "Specifies the service(s) available down this rewrite path. It may also "
 "specify the particular protocol that is used to talk with a service. A "
@@ -335,92 +299,129 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid "Regular Expression"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:307
+#: admin/dns/class_DnsRecordAttribute.inc:272
 msgid ""
 "A STRING containing a substitution expression that is applied to the "
 "original string held by the client in order to construct the next domain "
 "name to lookup."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid "Replacement"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:311
+#: admin/dns/class_DnsRecordAttribute.inc:276
 msgid ""
 "The next NAME to query for NAPTR, SRV, or address records depending on the "
 "value of the flags field."
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:320
-msgid ""
-"Domain name which specifies a host which should be authoritative for the "
-"specified class and domain"
-msgstr ""
-
-#: admin/dns/class_DnsRecordAttribute.inc:326
+#: admin/dns/class_DnsRecordAttribute.inc:287
 msgid "SRV Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:330
+#: admin/dns/class_DnsRecordAttribute.inc:291
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid "Priority"
+msgstr "ä¼˜å…ˆçº§"
+
+#: admin/dns/class_DnsRecordAttribute.inc:291
 msgid "Priority of the target host, lower value means more preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid "Weight"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:335
+#: admin/dns/class_DnsRecordAttribute.inc:296
 msgid ""
 "Relative weight for records with the same priority, higher value means more "
 "preferred"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "Port"
 msgstr "ç«¯å£"
 
-#: admin/dns/class_DnsRecordAttribute.inc:340
+#: admin/dns/class_DnsRecordAttribute.inc:301
 msgid "TCP or UDP port on which the service is to be found"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:345
+#: admin/dns/class_DnsRecordAttribute.inc:306
+#: admin/dns/class_DnsRecordAttribute.inc:322
+#: admin/dns/class_DnsRecordAttribute.inc:329
+#: admin/dns/class_DnsRecordAttribute.inc:348
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid "Target"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:306
 msgid ""
 "Canonical hostname of the machine providing the service, ending in a dot"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354 admin/dns/class_dnsZone.inc:45
+#: admin/dns/class_DnsRecordAttribute.inc:322
+msgid "An IPv4 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:329
+msgid "An IPv6 address"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:339
+msgid "MX Record"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:343
+msgid ""
+"Preference given to this RR among others at the same owner, lower values are"
+" preferred"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:348
+msgid ""
+"Domain name which specifies a host willing to act as a mail exchange for the"
+" owner name"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:360
+msgid ""
+"Domain name which specifies a host which should be authoritative for the "
+"specified class and domain"
+msgstr ""
+
+#: admin/dns/class_DnsRecordAttribute.inc:369 admin/dns/class_dnsZone.inc:45
 #: admin/dns/class_dnsZone.inc:54
 msgid "Record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:354
+#: admin/dns/class_DnsRecordAttribute.inc:369
 msgid ""
 "SSHFP record content. Can be obtained using \"ssh-keygen -r some.host.tld\","
 " or sshfp command for instance"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Redirect to"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:360
+#: admin/dns/class_DnsRecordAttribute.inc:375
 msgid "Domain that this subdomain is an alias of"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:366
+#: admin/dns/class_DnsRecordAttribute.inc:381
 msgid "Content of this record"
 msgstr ""
 
-#: admin/dns/class_DnsRecordAttribute.inc:426
+#: admin/dns/class_DnsRecordAttribute.inc:441
 msgid "The entered IP does not match the selected reverse zone"
 msgstr ""
 
@@ -449,169 +450,169 @@ msgstr ""
 msgid "DNS Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:347 admin/dns/class_dnsZone.inc:390
-#: admin/dns/class_dnsZone.inc:415
+#: admin/dns/class_dnsZone.inc:349 admin/dns/class_dnsZone.inc:392
+#: admin/dns/class_dnsZone.inc:417
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: admin/dns/class_dnsZone.inc:528
+#: admin/dns/class_dnsZone.inc:530
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase and end with a final "
 "dot.<br/><br/>Example: example.com."
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:531
+#: admin/dns/class_dnsZone.inc:533
 #, php-format
 msgid ""
 "\"%s\" must contain a domain name in lowercase.<br/><br/>Example: "
 "example.com"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:552 admin/dns/class_dnsZone.inc:553
-#: admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:554 admin/dns/class_dnsZone.inc:555
+#: admin/dns/class_dnsZone.inc:557
 msgid "DNS zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:570
+#: admin/dns/class_dnsZone.inc:572
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/dns/class_dnsZone.inc:574
+#: admin/dns/class_dnsZone.inc:576
 msgid "Zone name"
 msgstr "åŸŸåç§°"
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 msgid "Reverse zones"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:584
+#: admin/dns/class_dnsZone.inc:586
 #, php-format
 msgid ""
 "Reverse zones for this zone in the form xx.xx.in-addr.arpa%1$s or "
 "x.x.ip6.arpa%1$s"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:597
+#: admin/dns/class_dnsZone.inc:599
 msgid "SOA record"
 msgstr "SOA è®°å½•"
 
-#: admin/dns/class_dnsZone.inc:600
+#: admin/dns/class_dnsZone.inc:602
 msgid "SOA Record"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid "Primary DNS server"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:604
+#: admin/dns/class_dnsZone.inc:606
 msgid ""
 "Domain name of the name server that was the original or primary source of "
 "data for this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid "Mail address"
 msgstr "é‚®ä»¶åœ°å€"
 
-#: admin/dns/class_dnsZone.inc:608
+#: admin/dns/class_dnsZone.inc:610
 msgid ""
 "Domain name which specifies the mailbox of the person responsible for this "
 "zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Serial number"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:612
+#: admin/dns/class_dnsZone.inc:614
 msgid "Version number of the original copy of the zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Refresh"
 msgstr "åˆ·æ–°"
 
-#: admin/dns/class_dnsZone.inc:617
+#: admin/dns/class_dnsZone.inc:619
 msgid "Time interval before the zone should be refreshed"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid "Retry"
 msgstr "é‡è¯•"
 
-#: admin/dns/class_dnsZone.inc:622
+#: admin/dns/class_dnsZone.inc:624
 msgid ""
 "Time interval that should elapse before a failed refresh should be retried"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid "Expire"
 msgstr "è¿‡æœŸ"
 
-#: admin/dns/class_dnsZone.inc:627
+#: admin/dns/class_dnsZone.inc:629
 msgid ""
 "Time value that specifies the upper limit on the time interval that can "
 "elapse before the zone is no longer authoritative"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/dns/class_dnsZone.inc:632
+#: admin/dns/class_dnsZone.inc:634
 msgid "Minimum TTL field that should be exported with any RR from this zone"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:643
+#: admin/dns/class_dnsZone.inc:645
 msgid "Records"
 msgstr ""
 
-#: admin/dns/class_dnsZone.inc:647
+#: admin/dns/class_dnsZone.inc:649
 msgid "The DNS records for this zone"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:122
+#: admin/systems/class_dnsHost.inc:119
 msgid "Edit the DNS zones of a system"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:143
+#: admin/systems/class_dnsHost.inc:140
 msgid "DNS zones for this host"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:150
+#: admin/systems/class_dnsHost.inc:147
 msgid "SOA records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:154 admin/systems/class_dnsHost.inc:221
+#: admin/systems/class_dnsHost.inc:151 admin/systems/class_dnsHost.inc:220
 msgid "DNS Records"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:217
+#: admin/systems/class_dnsHost.inc:216
 msgid "Primary servers"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:234
+#: admin/systems/class_dnsHost.inc:235
 #, php-format
 msgid "The DNS records for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:255
+#: admin/systems/class_dnsHost.inc:256
 #, php-format
 msgid "The primary server for zone \"%s\""
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:341 admin/systems/class_dnsHost.inc:361
+#: admin/systems/class_dnsHost.inc:338 admin/systems/class_dnsHost.inc:358
 #, php-format
 msgid "%d records were updated from %s to %s in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:376
+#: admin/systems/class_dnsHost.inc:373
 #, php-format
 msgid "%d records were removed in zone %s"
 msgstr ""
 
-#: admin/systems/class_dnsHost.inc:385
+#: admin/systems/class_dnsHost.inc:382
 msgid "DNS update"
 msgstr ""
 
diff --git a/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc b/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
index 4613c0d79a21d50f9e978d4a8ae6d92e709fda67..4a702a10b12ad12773e1953a972f33925b4bc148 100644
--- a/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
+++ b/dovecot/admin/systems/services/dovecot/class_serviceDovecot.inc
@@ -103,11 +103,6 @@ class serviceDovecot extends simpleService
     );
   }
 
-  function save()
-  {
-    parent::save();
-  }
-
   protected function post_save()
   {
     parent::post_save();
diff --git a/dovecot/locale/ar/fusiondirectory.po b/dovecot/locale/ar/fusiondirectory.po
index 1f1264e02894a12cd6352fb7afc0b25a5b931125..724294f2964add5b4cad70eb1a581f8d77d23122 100644
--- a/dovecot/locale/ar/fusiondirectory.po
+++ b/dovecot/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ca/fusiondirectory.po b/dovecot/locale/ca/fusiondirectory.po
index b7c36b622ae769db39d22682a25ff49336e727f1..da2423887158c120e78469433089ecc03b9d1426 100644
--- a/dovecot/locale/ca/fusiondirectory.po
+++ b/dovecot/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/cs_CZ/fusiondirectory.po b/dovecot/locale/cs_CZ/fusiondirectory.po
index 9dc44bddb3bdca2cdf9d9c55b4ed986231664aa0..72fa5be37b2834aa3a49b6b3df8a842a84facc30 100644
--- a/dovecot/locale/cs_CZ/fusiondirectory.po
+++ b/dovecot/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +29,8 @@ msgstr "PoÅ¡tovnÃ server pro tento ÃºÄet je neplatnÃ½!"
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
 #, php-format
 msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr "Chyba pÅ™i pokusu kontaktovat Dovecot server prostÅ™ednictvÃm Argonaut: %s"
+msgstr ""
+"Chyba pÅ™i pokusu kontaktovat Dovecot server prostÅ™ednictvÃm Argonaut: %s"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
@@ -37,7 +39,7 @@ msgstr "Dovecot (IMAP/POP3)"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:43
 msgid "Dovecot connection"
@@ -49,7 +51,7 @@ msgstr "URL adrea pro pÅ™ipojenÃ k Dovecot serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname"
-msgstr "NÃ¡zev stroje"
+msgstr "NÃ¡zev poÄÃtaÄe"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname of the Dovecot server"
@@ -57,7 +59,7 @@ msgstr "NÃ¡zev poÄÃtaÄe, na kterÃ©m je provozovÃ¡n Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:54
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:54
 msgid "Port number on which Dovecot server should be contacted"
@@ -85,7 +87,7 @@ msgstr "HlavnÃ pÅ™ihlaÅ¡ovacÃ Ãºdaje"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:79
 msgid "Admin user"
-msgstr "SprÃ¡vce"
+msgstr "sprÃ¡vce"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:79
 msgid "Dovecot server admin user"
@@ -93,7 +95,7 @@ msgstr "ÃšÄet sprÃ¡vce Dovecot serveru"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Admin user password"
@@ -117,4 +119,6 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
-msgstr "Pro vytvoÅ™enÃ e-mailovÃ© schrÃ¡nky uÅ¾ivatele na Dovecot serveru pouÅ¾ijte argonaut"
+msgstr ""
+"Pro vytvoÅ™enÃ e-mailovÃ© schrÃ¡nky uÅ¾ivatele na Dovecot serveru pouÅ¾ijte "
+"argonaut"
diff --git a/dovecot/locale/de/fusiondirectory.po b/dovecot/locale/de/fusiondirectory.po
index 06398027b9f690435678d2602611b836fd268257..1ee48352de023f4517c5282019ea2130633accfb 100644
--- a/dovecot/locale/de/fusiondirectory.po
+++ b/dovecot/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/el_GR/fusiondirectory.po b/dovecot/locale/el_GR/fusiondirectory.po
index 8908bb844c1bdf5b256b1c5e845ab611860cb66c..50d227054bb20c0aab669d5c6c349d9e500a17f9 100644
--- a/dovecot/locale/el_GR/fusiondirectory.po
+++ b/dovecot/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +29,9 @@ 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 "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î± ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±Ï‚ Î¼Îµ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Dovecot Î¼ÎÏƒÏ‰ Ï„Î¿Ï… Argonaut: %s"
+msgstr ""
+"Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹Î± ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±Ï‚ Î¼Îµ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Dovecot Î¼ÎÏƒÏ‰ Ï„Î¿Ï… "
+"Argonaut: %s"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
@@ -50,7 +52,7 @@ msgstr "URL ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÏƒÎµ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname"
-msgstr "ÎŒÎ½Î¿Î¼Î± Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®"
+msgstr "ÎŒÎ½Î¿Î¼Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname of the Dovecot server"
@@ -94,7 +96,7 @@ msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Password"
-msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
+msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚:"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Admin user password"
@@ -106,7 +108,8 @@ msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚:"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:87
 msgid "Path to the directory in which user maildirs must be created"
-msgstr "Î”Î¹Î±Î´ÏÎ¿Î¼Î® Î³Î¹Î± Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸Î¿ÏÎ½ Ï„Î± maildirs"
+msgstr ""
+"Î”Î¹Î±Î´ÏÎ¿Î¼Î® Î³Î¹Î± Ï„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÏƒÏ„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸Î¿ÏÎ½ Ï„Î± maildirs"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:94
 msgid "Options"
@@ -118,4 +121,6 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
-msgstr "Î§ÏÎ®ÏƒÎ· argonaut Î³Î¹Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²Ï‰Ï„Î¯Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÏ„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Dovecot"
+msgstr ""
+"Î§ÏÎ®ÏƒÎ· argonaut Î³Î¹Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Ï„Î¿Ï… Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²Ï‰Ï„Î¯Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÏ„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® "
+"Dovecot"
diff --git a/dovecot/locale/en/fusiondirectory.po b/dovecot/locale/en/fusiondirectory.po
index 8fc4ffbd27119842cd8be578d6b3c9a9c39162c1..f58cfeb299702040c10eb9437530e8cca78fdc7e 100644
--- a/dovecot/locale/en/fusiondirectory.po
+++ b/dovecot/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/dovecot/locale/es/fusiondirectory.po b/dovecot/locale/es/fusiondirectory.po
index a1fb3372f66b40c0e4c4f7b3cada43ce07b86fab..fe41a96b5505720763bc8bb8e188818bfd4867a9 100644
--- a/dovecot/locale/es/fusiondirectory.po
+++ b/dovecot/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/es_CO/fusiondirectory.po b/dovecot/locale/es_CO/fusiondirectory.po
index b616eb32b3bbf818cc074946bd9cf9eb8f862e8a..9a2b062fab8f74c8968bfe5147427a7c17daece1 100644
--- a/dovecot/locale/es_CO/fusiondirectory.po
+++ b/dovecot/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/es_VE/fusiondirectory.po b/dovecot/locale/es_VE/fusiondirectory.po
index 9b59481d84a2495a20069474944f21ec157d5707..3cbd60d7a2e9846292dca4f9b15daf6e3ff248af 100644
--- a/dovecot/locale/es_VE/fusiondirectory.po
+++ b/dovecot/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/fa_IR/fusiondirectory.po b/dovecot/locale/fa_IR/fusiondirectory.po
index 84e11bd4d33d0866da18818346671ec058a23433..d89d75ad34ada155ae77b6d47e91cc3730015e80 100644
--- a/dovecot/locale/fa_IR/fusiondirectory.po
+++ b/dovecot/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/fi_FI/fusiondirectory.po b/dovecot/locale/fi_FI/fusiondirectory.po
index 4809a6770bb9d0d1e9767ae837cf25a1ef81f93c..913aeb13a4abc11b5f4fe2dd2036295c5786fdc4 100644
--- a/dovecot/locale/fi_FI/fusiondirectory.po
+++ b/dovecot/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/fr/fusiondirectory.po b/dovecot/locale/fr/fusiondirectory.po
index 9da53da651094e19c0ce7c86a1d4fff4065ad0b9..49b5734e1467df9a07fa91337cfaca0c8974c702 100644
--- a/dovecot/locale/fr/fusiondirectory.po
+++ b/dovecot/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,11 +20,11 @@ msgstr ""
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:50
 msgid "There are no IMAP compatible mail servers defined!"
-msgstr "Il n'y a aucun serveur IMAP compatible dÃ©finiâ€¯!"
+msgstr "Il n'y a aucun serveur IMAP compatibles dÃ©finis !"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:55
 msgid "Mail server for this account is invalid!"
-msgstr "Le serveur de courriel pour ce compte est invalideâ€¯!"
+msgstr "Le serveur de messagerie pour ce compte est non valide !"
 
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
 #, php-format
@@ -39,7 +38,7 @@ msgstr "Dovecot (IMAP/POP3)"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:43
 msgid "Dovecot connection"
@@ -51,7 +50,7 @@ msgstr "URL de connexion au serveur Dovecot"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname"
-msgstr "Nom d'hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname of the Dovecot server"
@@ -99,7 +98,7 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Admin user password"
-msgstr "Mot de passe du compte administrateur"
+msgstr "Mot de passe utilisateur Administrateur"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:87
 msgid "Mail directory"
@@ -107,7 +106,9 @@ msgstr "RÃ©pertoire des courriels"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:87
 msgid "Path to the directory in which user maildirs must be created"
-msgstr "Chemin vers le rÃ©pertoire dans lequel les boites de courriel doivent Ãªtre crÃ©es"
+msgstr ""
+"Chemin vers le rÃ©pertoire dans lequel les boites de courriel doivent Ãªtre "
+"crÃ©es"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:94
 msgid "Options"
diff --git a/dovecot/locale/hu_HU/fusiondirectory.po b/dovecot/locale/hu_HU/fusiondirectory.po
index 036c4dfcba67c5bc34910086fd2d904f247f7d2b..b5343440ea9064f79d1ae1fa0414fadf96904f92 100644
--- a/dovecot/locale/hu_HU/fusiondirectory.po
+++ b/dovecot/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/id/fusiondirectory.po b/dovecot/locale/id/fusiondirectory.po
index 10fcfdc4116eda45b875ca51288bddc8608453f7..90883da477ea77f7cfac4361543c331ce92aa525 100644
--- a/dovecot/locale/id/fusiondirectory.po
+++ b/dovecot/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/it_IT/fusiondirectory.po b/dovecot/locale/it_IT/fusiondirectory.po
index a84655d24db8fb3c5cd03ea3eb75e2110363690e..28c8180488cadfab8332b3693f19b58c1db085b3 100644
--- a/dovecot/locale/it_IT/fusiondirectory.po
+++ b/dovecot/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:22+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +29,9 @@ msgstr "Il server di posta elettronica di questo account non Ã¨ valido !"
 #: personal/mail/mail-methods/class_mail-methods-dovecot.inc:194
 #, php-format
 msgid "Error while trying to contact Dovecot server through Argonaut: %s"
-msgstr "Errore durante il tentativo di contattare il server Dovecot attraverso Argonaut: %s"
+msgstr ""
+"Errore durante il tentativo di contattare il server Dovecot attraverso "
+"Argonaut: %s"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
diff --git a/dovecot/locale/lv/fusiondirectory.po b/dovecot/locale/lv/fusiondirectory.po
index df49469798d15a37ed53ce62bcccb68b6d67e49d..0d17e40ebd9cd7778bcd5b8c45ab572dad047b66 100644
--- a/dovecot/locale/lv/fusiondirectory.po
+++ b/dovecot/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/nb/fusiondirectory.po b/dovecot/locale/nb/fusiondirectory.po
index 4b34b34f2bd7b5a726f1391e43c53605b1cdff16..d3248e0a6f4d6d03fedc9a14252c49b4c950bfa7 100644
--- a/dovecot/locale/nb/fusiondirectory.po
+++ b/dovecot/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/nl/fusiondirectory.po b/dovecot/locale/nl/fusiondirectory.po
index c46dff3f3cb37af2db8e8c4fb1d5835ebd184511..892e096c17fcf6cbe1b726635c5d614b5a3fb073 100644
--- a/dovecot/locale/nl/fusiondirectory.po
+++ b/dovecot/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@ msgstr ""
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:28
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Dovecot (IMAP/POP3)"
-msgstr ""
+msgstr "Dovecot (IMAP/POP3)"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:29
 msgid "Services"
@@ -49,7 +50,7 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname"
-msgstr ""
+msgstr "hostname"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:50
 msgid "Hostname of the Dovecot server"
@@ -73,7 +74,7 @@ msgstr ""
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:64
 msgid "Validate TLS/SSL Certificates"
-msgstr ""
+msgstr "Valideer TLS/SSL certificaten"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:64
 msgid "Weither or not to validate server certificates on connection"
@@ -97,7 +98,7 @@ msgstr "Wachtwoord"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:83
 msgid "Admin user password"
-msgstr ""
+msgstr "Admin gebruikers wachtwoord"
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:87
 msgid "Mail directory"
diff --git a/dovecot/locale/pl/fusiondirectory.po b/dovecot/locale/pl/fusiondirectory.po
index 3314b17e3ddbaeb02cc6b5f774109f9522f03fd9..38e09b0656ab4f4a3b23c8a55c083547f42e09df 100644
--- a/dovecot/locale/pl/fusiondirectory.po
+++ b/dovecot/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/pt/fusiondirectory.po b/dovecot/locale/pt/fusiondirectory.po
index 11ddba7e2eaf87eccff40cfc9b463a9eb52bc678..63d039e526bd981b14d06f2adf27897e97bb81d4 100644
--- a/dovecot/locale/pt/fusiondirectory.po
+++ b/dovecot/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/pt_BR/fusiondirectory.po b/dovecot/locale/pt_BR/fusiondirectory.po
index 76c47b51741ff6c72a52dcedc8dbf4072662f169..75a5ebcb9a268d299c7aec21325e5e42a2774c91 100644
--- a/dovecot/locale/pt_BR/fusiondirectory.po
+++ b/dovecot/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ru/fusiondirectory.po b/dovecot/locale/ru/fusiondirectory.po
index a586f2d5d3d792a41c3b30fdfddda3fa431ff05d..65ebedcce08a097fabfe9ef0dd77fba5e99300d1 100644
--- a/dovecot/locale/ru/fusiondirectory.po
+++ b/dovecot/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -119,4 +118,6 @@ msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ Ð¿Ð°Ð¿ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ñ‡ÐµÑ€ÐµÐ· Argo
 
 #: admin/systems/services/dovecot/class_serviceDovecot.inc:97
 msgid "Use argonaut to create the user mailbox on the Dovecot server"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ argonaut Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ðµ Dovecot"
+msgstr ""
+"Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ argonaut Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ñ… ÑÑ‰Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ðµ "
+"Dovecot"
diff --git a/dovecot/locale/ru@petr1708/fusiondirectory.po b/dovecot/locale/ru@petr1708/fusiondirectory.po
index a4eda385f60030f46b032ce5db28aad53021043b..b53168586e765f3e9552ab48e44e261e96f1b914 100644
--- a/dovecot/locale/ru@petr1708/fusiondirectory.po
+++ b/dovecot/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/sv/fusiondirectory.po b/dovecot/locale/sv/fusiondirectory.po
index 8bf541ea45ff3e217365cb79df21be85eb7d54ea..63ee9ea10c64df4049ec6e4fdd1ac91b6dbf7237 100644
--- a/dovecot/locale/sv/fusiondirectory.po
+++ b/dovecot/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/ug/fusiondirectory.po b/dovecot/locale/ug/fusiondirectory.po
index 35db1d212c3c33aea871be06896054a366a6655c..ea6fd3dc300146a044a8a178080c15d00da869ea 100644
--- a/dovecot/locale/ug/fusiondirectory.po
+++ b/dovecot/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/vi_VN/fusiondirectory.po b/dovecot/locale/vi_VN/fusiondirectory.po
index 110036a633c9b2228e8762d5c83ddefed8af6eef..a598d486b3a26f7c42a10b8393f23efdfe9933af 100644
--- a/dovecot/locale/vi_VN/fusiondirectory.po
+++ b/dovecot/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/locale/zh/fusiondirectory.po b/dovecot/locale/zh/fusiondirectory.po
index 2e2e6140ddde98fd8acb27be7c9d4a64abe44026..7716b28c2106c9b8e0a6b1f22c67f1338418f9d6 100644
--- a/dovecot/locale/zh/fusiondirectory.po
+++ b/dovecot/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/dovecot/personal/mail/mail-methods/class_mail-methods-dovecot.inc b/dovecot/personal/mail/mail-methods/class_mail-methods-dovecot.inc
index 7cfdf63fffc518a9dacc194d90a3d2069c2910f6..9533b5c71ff4872bdb5ec38ee94d5b161a8dc07c 100644
--- a/dovecot/personal/mail/mail-methods/class_mail-methods-dovecot.inc
+++ b/dovecot/personal/mail/mail-methods/class_mail-methods-dovecot.inc
@@ -1,7 +1,7 @@
 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2013-2016  FusionDirectory
+  Copyright (C) 2013-2017  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@ class mailMethodDovecot extends mailMethod
         'connect'   => $attrs['fdDovecotConnect'][0],
         'admin'     => $attrs['fdDovecotAdmin'][0],
         'password'  => $attrs['fdDovecotPassword'][0],
-        'mkdir'     => (isset($attrs['fdDovecotArgonautMkdir'])?(strtoupper($attrs['fdDovecotArgonautMkdir'][0]) == 'TRUE'):TRUE),
+        'mkdir'     => (isset($attrs['fdDovecotArgonautMkdir']) ? (strtoupper($attrs['fdDovecotArgonautMkdir'][0]) == 'TRUE') : TRUE),
         'mac'       => $attrs['macAddress'][0],
       );
     }
diff --git a/dsa/admin/dsa/class_simpleSecurityObject.inc b/dsa/admin/dsa/class_simpleSecurityObject.inc
index bc3d42f92b2cd992dc082195d1b54f4cdc9a1fc6..ea44e346c76428c12078c5c222c3ef513e29902d 100644
--- a/dsa/admin/dsa/class_simpleSecurityObject.inc
+++ b/dsa/admin/dsa/class_simpleSecurityObject.inc
@@ -55,6 +55,10 @@ class simpleSecurityObject extends simplePlugin
             _('Entry name'), _('Account name'),
             'cn', TRUE
           ),
+          new TextAreaAttribute (
+            _('Description'), _('Description of this simple security object'),
+            'description', FALSE
+          ),
         )
       ),
       'password' => array(
diff --git a/dsa/locale/ar/fusiondirectory.po b/dsa/locale/ar/fusiondirectory.po
index 60ebb1de6dde2a07ce0c611c6360c2bd285e1189..83d611afb47c05a53ef510476ee6b66bbc22930d 100644
--- a/dsa/locale/ar/fusiondirectory.po
+++ b/dsa/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Ø§Ù„ÙˆØµÙ"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/ca/fusiondirectory.po b/dsa/locale/ca/fusiondirectory.po
index 7bf8d339f7fa8e370bcc41a958e2fbbe797e51e8..ba8635c3ede2ae53ce76d177ea9410085566837b 100644
--- a/dsa/locale/ca/fusiondirectory.po
+++ b/dsa/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Contrasenya"
diff --git a/dsa/locale/cs_CZ/fusiondirectory.po b/dsa/locale/cs_CZ/fusiondirectory.po
index eabb411fbf2517ac9fd1bd98f575978406ec10f4..62ecda5d9cb30f4c8d939c14be74c281bb504ff3 100644
--- a/dsa/locale/cs_CZ/fusiondirectory.po
+++ b/dsa/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr "NÃ¡zev poloÅ¾ky"
 msgid "Account name"
 msgstr "NÃ¡zev ÃºÄtu"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "popis"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
-msgstr "ZmÄ›nit heslo"
+msgstr "zmÄ›nit heslo"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
diff --git a/dsa/locale/de/fusiondirectory.po b/dsa/locale/de/fusiondirectory.po
index 1dce89373926513d048afea4c49895d0d6e484a8..b5744fcc8a9a674cfc1792baba901f1049c3b54a 100644
--- a/dsa/locale/de/fusiondirectory.po
+++ b/dsa/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,10 +58,18 @@ msgstr "Eingangsname"
 msgid "Account name"
 msgstr "Kontenname"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Beschreibung"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Passwort Ã¤ndern"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Passwort"
diff --git a/dsa/locale/el_GR/fusiondirectory.po b/dsa/locale/el_GR/fusiondirectory.po
index 501c37721a865460a7839eb149a53d4c5dfa7a16..7d6597472c9b7250edd08b4eb12c7b929d393fe4 100644
--- a/dsa/locale/el_GR/fusiondirectory.po
+++ b/dsa/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,10 +58,18 @@ msgstr "ÎŒÎ½Î¿Î¼Î± ÎºÎ±Ï„Î±Ï‡ÏŽÏÎ·ÏƒÎ·Ï‚"
 msgid "Account name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Î‘Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
-msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
+msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚:"
diff --git a/dsa/locale/en/fusiondirectory.po b/dsa/locale/en/fusiondirectory.po
index 4fb9564cb35d3845d27066f2cfaad85d1baa03bf..664f8892c9a8fcabe2a532d4fa9c6cd93ae47edc 100644
--- a/dsa/locale/en/fusiondirectory.po
+++ b/dsa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -57,10 +57,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/es/fusiondirectory.po b/dsa/locale/es/fusiondirectory.po
index d7de561e769d08464c842c1f0663d26ae602cd9f..3a9037e40c9ded3ff67fa400e0ee344d22cd0408 100644
--- a/dsa/locale/es/fusiondirectory.po
+++ b/dsa/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Cambiar contraseÃ±a"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "ContraseÃ±a"
diff --git a/dsa/locale/es_CO/fusiondirectory.po b/dsa/locale/es_CO/fusiondirectory.po
index e418749614b2b140d4636f731735e60e39b769ba..ea981fc610c8f989488496452b7a6b4213a212b5 100644
--- a/dsa/locale/es_CO/fusiondirectory.po
+++ b/dsa/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "ContraseÃ±a"
diff --git a/dsa/locale/es_VE/fusiondirectory.po b/dsa/locale/es_VE/fusiondirectory.po
index e45a60602ef0eb23a50e22757ae1ca31dad3e6aa..6ea19a93bc5c30ae2b3bdbda8591c7ed2c45bb87 100644
--- a/dsa/locale/es_VE/fusiondirectory.po
+++ b/dsa/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Cambiar contraseÃ±a"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "ContraseÃ±a"
diff --git a/dsa/locale/fa_IR/fusiondirectory.po b/dsa/locale/fa_IR/fusiondirectory.po
index 77949b4d2de9bc2c4bd2b6e6a3bd41ca42868d57..346ed7d59f384ddebda2bcef3eab66af214f1dea 100644
--- a/dsa/locale/fa_IR/fusiondirectory.po
+++ b/dsa/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +57,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/fi_FI/fusiondirectory.po b/dsa/locale/fi_FI/fusiondirectory.po
index c76564f2b1be4bf5e3e61b266ef4f3601de3f181..5e7b517ed3ba73b566d1a3db6b311005edb3621f 100644
--- a/dsa/locale/fi_FI/fusiondirectory.po
+++ b/dsa/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Kuvaus"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Salasana"
diff --git a/dsa/locale/fr/fusiondirectory.po b/dsa/locale/fr/fusiondirectory.po
index 58090a7202d0c88a2a34cdfb35a37a2a86e2914e..e10b3cba34e3b1a2305f3e6b68a8f0fede8f6554 100644
--- a/dsa/locale/fr/fusiondirectory.po
+++ b/dsa/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: config/dsa/class_dsaConfig.inc:28
 msgid "DSA configuration"
-msgstr "Configuration DSA"
+msgstr "Configuration de DSA"
 
 #: config/dsa/class_dsaConfig.inc:29
 msgid "FusionDirectory dsa plugin configuration"
@@ -33,22 +33,24 @@ msgstr "DSA"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "DSA RDN"
-msgstr "Branche DSA"
+msgstr "DSA RDN"
 
 #: config/dsa/class_dsaConfig.inc:45
 msgid "Branch in which Directory Service Account (dsa) will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les objets Directory Service Account (dsa)"
+msgstr ""
+"Branche dans laquelle les compte DSA (Directory Service Account)  sont "
+"stockÃ©s"
 
 #: admin/dsa/class_dsaManagement.inc:35
 msgid "DSA management"
-msgstr "Gestion DSA"
+msgstr "Gestion des objets de sÃ©curitÃ©"
 
 #: admin/dsa/class_simpleSecurityObject.inc:31
 #: admin/dsa/class_simpleSecurityObject.inc:32
 #: admin/dsa/class_simpleSecurityObject.inc:34
 #: admin/dsa/class_simpleSecurityObject.inc:51
 msgid "Simple security object"
-msgstr "Simple objet de sÃ©curitÃ©"
+msgstr "simple objet de sÃ©curitÃ©"
 
 #: admin/dsa/class_simpleSecurityObject.inc:55
 msgid "Entry name"
@@ -58,10 +60,18 @@ msgstr "Nom"
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Description"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr "Description de ce compte  DSA"
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Mot de passe"
diff --git a/dsa/locale/hu_HU/fusiondirectory.po b/dsa/locale/hu_HU/fusiondirectory.po
index 2e952c05f0be06c6f2d027273a042d9ca4389b98..580f60f458ddc59e337b9607c8c0b174d811d1a0 100644
--- a/dsa/locale/hu_HU/fusiondirectory.po
+++ b/dsa/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Szabi Fekete <szabi@equio.co.uk>, 2017\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "LeÃrÃ¡s"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/id/fusiondirectory.po b/dsa/locale/id/fusiondirectory.po
index f8ddb8b1efa2d7391482537e0d16996473ce6553..442c87894cc1e41cbb7d106221f0dd27fb5dd603 100644
--- a/dsa/locale/id/fusiondirectory.po
+++ b/dsa/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +57,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/it_IT/fusiondirectory.po b/dsa/locale/it_IT/fusiondirectory.po
index 5815c205f97caeed4ac8248f76c95ca31cea7951..ffec7ddb3bcafc0ca5e385800488554cccf2c86d 100644
--- a/dsa/locale/it_IT/fusiondirectory.po
+++ b/dsa/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,10 +58,18 @@ msgstr "nome della voce"
 msgid "Account name"
 msgstr "Nome dell'account"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr "Descrizione di questo semplice oggetto di sicurezza"
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Password"
diff --git a/dsa/locale/lv/fusiondirectory.po b/dsa/locale/lv/fusiondirectory.po
index 4178abd2c0f0a15198e75da85c62c2c1b31588b0..db087f115810465e09b93566260178427b296985 100644
--- a/dsa/locale/lv/fusiondirectory.po
+++ b/dsa/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Apraksts"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/nb/fusiondirectory.po b/dsa/locale/nb/fusiondirectory.po
index f0861d4a2d744bc1d15ae7992f86b37c1acb97a1..f52856b923f61c8c15270fb6bb769ecc744cd8ba 100644
--- a/dsa/locale/nb/fusiondirectory.po
+++ b/dsa/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/nl/fusiondirectory.po b/dsa/locale/nl/fusiondirectory.po
index dbaa484c0760cd1c3bfd375f94cf843aa01284b6..3adc17c51215105278b8347379c0a2a06c363789 100644
--- a/dsa/locale/nl/fusiondirectory.po
+++ b/dsa/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr "Naam inzending"
 msgid "Account name"
 msgstr "Account naam"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Wachtwoord"
diff --git a/dsa/locale/pl/fusiondirectory.po b/dsa/locale/pl/fusiondirectory.po
index 2773574918fbbf84132abcc45501772debde54d5..0054fb9028516afa9fd096c283579a1fce2decc1 100644
--- a/dsa/locale/pl/fusiondirectory.po
+++ b/dsa/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Opis"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "ZmieÅ„ hasÅ‚o"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "HasÅ‚o"
diff --git a/dsa/locale/pt/fusiondirectory.po b/dsa/locale/pt/fusiondirectory.po
index 1723b4f7f30461fe48031ff71d481f698a301af1..6d0a63d36ef721f3a4371a49dd2824d0a21430f4 100644
--- a/dsa/locale/pt/fusiondirectory.po
+++ b/dsa/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Senha"
diff --git a/dsa/locale/pt_BR/fusiondirectory.po b/dsa/locale/pt_BR/fusiondirectory.po
index 39fa677b2443208ff234efa5996d5b3226fd3519..b28275f1f2e75bcb83e068c2343a1c59dfca3e1a 100644
--- a/dsa/locale/pt_BR/fusiondirectory.po
+++ b/dsa/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr "Nome de entrada"
 msgid "Account name"
 msgstr "Nome de conta"
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Senha"
diff --git a/dsa/locale/ru/fusiondirectory.po b/dsa/locale/ru/fusiondirectory.po
index 3d971583be714cf3c08411f03cbdf986fe04f353..5e1e1e9b9a68d90268b5b0849a829f2b4a997f6b 100644
--- a/dsa/locale/ru/fusiondirectory.po
+++ b/dsa/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Ð¡Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
diff --git a/dsa/locale/ru@petr1708/fusiondirectory.po b/dsa/locale/ru@petr1708/fusiondirectory.po
index 71a138d246abcc0bd1bb49e9460b7e3ca4965fa0..3b8b3dee7ab3a6ecc1e5908ba75c53d54315cd0c 100644
--- a/dsa/locale/ru@petr1708/fusiondirectory.po
+++ b/dsa/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +57,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/sv/fusiondirectory.po b/dsa/locale/sv/fusiondirectory.po
index 90bca781d6a9f0b177d425f3ea9260a26a2f9254..da140c2718b02ae1e680d9073875c1c079a9ff2a 100644
--- a/dsa/locale/sv/fusiondirectory.po
+++ b/dsa/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "Beskrivning"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Byt lÃ¶senord"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "LÃ¶senord"
diff --git a/dsa/locale/ug/fusiondirectory.po b/dsa/locale/ug/fusiondirectory.po
index 6275a19b91f98754c145f2c1d09b325fb2024286..7c2812cebccb2c2bfa9ac4f09fe52f2db33e0195 100644
--- a/dsa/locale/ug/fusiondirectory.po
+++ b/dsa/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +57,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr ""
diff --git a/dsa/locale/vi_VN/fusiondirectory.po b/dsa/locale/vi_VN/fusiondirectory.po
index 5f772c3f0f9712ac5a3f8b314b07c89eb4b597d6..2983e1e321c885e8688ad0a8edc1186e18484a47 100644
--- a/dsa/locale/vi_VN/fusiondirectory.po
+++ b/dsa/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "MÃ´ táº£"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "Thay Ä‘á»•i máºt mÃ£ "
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "Máºt kháº©u"
diff --git a/dsa/locale/zh/fusiondirectory.po b/dsa/locale/zh/fusiondirectory.po
index d67fb188428e6220f7c247fcb4155b5fdc710e91..fd5649bd7cff4da94a5cba2ffd4100699668db58 100644
--- a/dsa/locale/zh/fusiondirectory.po
+++ b/dsa/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,10 +58,18 @@ msgstr ""
 msgid "Account name"
 msgstr ""
 
-#: admin/dsa/class_simpleSecurityObject.inc:61
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description"
+msgstr "æè¿°"
+
+#: admin/dsa/class_simpleSecurityObject.inc:59
+msgid "Description of this simple security object"
+msgstr ""
+
+#: admin/dsa/class_simpleSecurityObject.inc:65
 msgid "Change password"
 msgstr "ä¿®æ”¹å£ä»¤"
 
-#: admin/dsa/class_simpleSecurityObject.inc:64
+#: admin/dsa/class_simpleSecurityObject.inc:68
 msgid "Password"
 msgstr "å£ä»¤"
diff --git a/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc b/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
index bf3f54c4121cada28b6146080e29ec04f5c11250..db47d6ae74d76c41ebd1c33c1f0b6b4ee71d7c63 100644
--- a/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
+++ b/ejbca/admin/ejbca/certificates/class_ejbcaCertificates.inc
@@ -29,7 +29,7 @@ class ejbcaCertificates extends simplePlugin
       'plShortName'     => _('EJBCA'),
       'plDescription'   => _('Assign EJBCA certificates to a user'),
       'plSelfModify'    => TRUE,
-      'plObjectType'    => array('user','server','workstation','terminal','printer','component','winstation','phone','mobilePhone'),
+      'plObjectType'    => array('user','server','workstation','terminal','printer','component','phone','mobilePhone'),
       'plIcon'          => 'geticon.php?context=applications&icon=ejbca&size=48',
       'plSmallIcon'     => 'geticon.php?context=applications&icon=ejbca&size=16',
       'plForeignKeys'   => array(
diff --git a/ejbca/admin/ejbca/class_ejbcaCertSelect.inc b/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
index 5a8543419a04223e6982efd10388414b4d8cb31d..73014ab0088ff88d910be0601f2a547f53a3fcde 100644
--- a/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
+++ b/ejbca/admin/ejbca/class_ejbcaCertSelect.inc
@@ -89,7 +89,7 @@ class EjbcaUserCertsAttribute extends GenericDialogAttribute
   {
     $id   = $this->getHtmlId();
     $div  = new divSelectBox($id);
-    /* Updates and get display values */
+    // Updates and get display values
     $displays = $this->getDisplayValues();
     foreach ($displays as $key => $display_item) {
       $fields = array(
diff --git a/ejbca/admin/ejbca/class_ejbcaManagement.inc b/ejbca/admin/ejbca/class_ejbcaManagement.inc
index 12b486d18a719d4326103bee1c9871b0576ad92f..75c9fa526b1fa844fd7920dbcbbd9cb2d1d9f8bb 100644
--- a/ejbca/admin/ejbca/class_ejbcaManagement.inc
+++ b/ejbca/admin/ejbca/class_ejbcaManagement.inc
@@ -56,7 +56,7 @@ class ejbcaManagement extends simpleManagement
     $this->registerAction('download', 'downloadEntry');
   }
 
-  function downloadEntry($action, $targets, $all)
+  function downloadEntry($action, array $targets)
   {
     $entry = $this->headpage->getEntry($targets[0]);
     session::set('binary', $entry['userCertificate;binary'][0]);
diff --git a/ejbca/locale/ar/fusiondirectory.po b/ejbca/locale/ar/fusiondirectory.po
index b9ba4fcc62cd143230f5d9d40c5f6d8ddf2209b8..cc0fd4f53209b1c03eeff8010428642c1a44d492 100644
--- a/ejbca/locale/ar/fusiondirectory.po
+++ b/ejbca/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/ca/fusiondirectory.po b/ejbca/locale/ca/fusiondirectory.po
index f2ca37577a885229bb22c8e8260259694477ced7..dd87c14b8b47b53e7799424cc5ebd69862bc638d 100644
--- a/ejbca/locale/ca/fusiondirectory.po
+++ b/ejbca/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/cs_CZ/fusiondirectory.po b/ejbca/locale/cs_CZ/fusiondirectory.po
index fa45ee1d27bee8756b732b6455ce9e6412f97e22..d214b1bc5a2090ea52868aecde3bad2a5af02270 100644
--- a/ejbca/locale/cs_CZ/fusiondirectory.po
+++ b/ejbca/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,7 +61,7 @@ msgstr "SprÃ¡va EJBCA certifikÃ¡tÅ¯"
 
 #: admin/ejbca/class_ejbcaManagement.inc:52
 msgid "Download"
-msgstr "StÃ¡hnout si"
+msgstr "staÅ¾enÃ"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:30
 #: admin/ejbca/class_ejbcaCertificate.inc:31
@@ -76,11 +76,11 @@ msgstr "CertifikÃ¡t"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:51
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:51
 msgid "Common name"
-msgstr "BÄ›Å¾nÃ½ nÃ¡zev (CN)"
+msgstr "bÄ›Å¾nÃ© jmÃ©no (CN)"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
diff --git a/ejbca/locale/de/fusiondirectory.po b/ejbca/locale/de/fusiondirectory.po
index e87f72e965cc5b3b19ac0620c0b8122b25458fe8..e579d74148ae8ef9dd4b9ae58a5705d1d2a6bcb8 100644
--- a/ejbca/locale/de/fusiondirectory.po
+++ b/ejbca/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/el_GR/fusiondirectory.po b/ejbca/locale/el_GR/fusiondirectory.po
index 4b1c90bd1ea5b2e0a80b7efaff12f0e59c98d177..eda01b25415972a36784e15fa9a482680f0c22a3 100644
--- a/ejbca/locale/el_GR/fusiondirectory.po
+++ b/ejbca/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/en/fusiondirectory.po b/ejbca/locale/en/fusiondirectory.po
index fae594f47299f1be26a30315351ecaa094e5fb2f..f3adb97bbe65d0e4f73eec7b5982b217676aeef4 100644
--- a/ejbca/locale/en/fusiondirectory.po
+++ b/ejbca/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ejbca/locale/es/fusiondirectory.po b/ejbca/locale/es/fusiondirectory.po
index 74934989aa5b6109bca54f8ab073922eeba52e15..f615d8dff89850e4c739a33b538e8f8c625f62c2 100644
--- a/ejbca/locale/es/fusiondirectory.po
+++ b/ejbca/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/es_CO/fusiondirectory.po b/ejbca/locale/es_CO/fusiondirectory.po
index 6afb91efe66cb1666c4ac0f0aaaa9c0d82608f49..d16a8c3abb4b857892590e8580e50d4f5bfc3f06 100644
--- a/ejbca/locale/es_CO/fusiondirectory.po
+++ b/ejbca/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/es_VE/fusiondirectory.po b/ejbca/locale/es_VE/fusiondirectory.po
index a21b81f69fdeebb1eb3a943164c1ceeaa51826fa..051e7370554754a74b01ddc92956ea01759f6079 100644
--- a/ejbca/locale/es_VE/fusiondirectory.po
+++ b/ejbca/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/fa_IR/fusiondirectory.po b/ejbca/locale/fa_IR/fusiondirectory.po
index 6ca991bb205a0cc67b9eafa92574e50b5b8c1ce3..7a44d8c946913b28b762a1bd5592df12cec12389 100644
--- a/ejbca/locale/fa_IR/fusiondirectory.po
+++ b/ejbca/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/fi_FI/fusiondirectory.po b/ejbca/locale/fi_FI/fusiondirectory.po
index 9d1dba09dc13a51fb0006ad1cceb7d9dc44dce2c..f3fac1a548f26ef30f664e0170a5e47b997aabc8 100644
--- a/ejbca/locale/fi_FI/fusiondirectory.po
+++ b/ejbca/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/fr/fusiondirectory.po b/ejbca/locale/fr/fusiondirectory.po
index d18456bff7d9af8fb032283555e7016be81fad94..9fd6e1c2aed0b0b675304049de1038eeaaf61030 100644
--- a/ejbca/locale/fr/fusiondirectory.po
+++ b/ejbca/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr "Configuration du plugin EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:29
 msgid "FusionDirectory ejbca plugin configuration"
-msgstr "Configuration du plugin ejbca pour FusionDirectory"
+msgstr "Configuration du plugin ejbca FusionDirectory"
 
 #: config/ejbca/class_ejbcaConfig.inc:42
 msgid "EJBCA plugin"
@@ -32,11 +32,11 @@ msgstr "Plugin EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "EJBCA RDN"
-msgstr "Branche EJBCA"
+msgstr "RDN EJBCA"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "Branch in which ejbca certificates are stored"
-msgstr "Branche dans laquelle sont stockÃ©s les certificats EJBCA"
+msgstr "Branche dans laquelle sont stockÃ©s les certificats ejbca"
 
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
@@ -61,7 +61,7 @@ msgstr "Gestion des certificats EJBCA"
 
 #: admin/ejbca/class_ejbcaManagement.inc:52
 msgid "Download"
-msgstr "TÃ©lÃ©charger"
+msgstr "TÃ©lÃ©chargement"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:30
 #: admin/ejbca/class_ejbcaCertificate.inc:31
diff --git a/ejbca/locale/hu_HU/fusiondirectory.po b/ejbca/locale/hu_HU/fusiondirectory.po
index 36a353c95ae0d0750ed83dc92d465c83ce36dd79..39dec5d8edb1aaa0a1344aa9f5c5a852eab03460 100644
--- a/ejbca/locale/hu_HU/fusiondirectory.po
+++ b/ejbca/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/id/fusiondirectory.po b/ejbca/locale/id/fusiondirectory.po
index e355b18f758b298cf349686aa85e00639a7fedca..491806aa7613f211459724dd3c25902f114c7320 100644
--- a/ejbca/locale/id/fusiondirectory.po
+++ b/ejbca/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/it_IT/fusiondirectory.po b/ejbca/locale/it_IT/fusiondirectory.po
index 9d2433582dfd2ce7b66abc0933c937e7a8ef62d0..5f7bf784dc636281e986eb5bd59c7ee6c5678482 100644
--- a/ejbca/locale/it_IT/fusiondirectory.po
+++ b/ejbca/locale/it_IT/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/lv/fusiondirectory.po b/ejbca/locale/lv/fusiondirectory.po
index 2dd37ae61679dee2af73e17b9c302dc8d7f92929..685940749d5c903227bf2d1a29fbc1753cbe59ff 100644
--- a/ejbca/locale/lv/fusiondirectory.po
+++ b/ejbca/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/nb/fusiondirectory.po b/ejbca/locale/nb/fusiondirectory.po
index 2882cbc69fc398e7e8dc847ec05f20f032d8c76a..8c77384d9005c3d37a9a0f5feb17f67ca2d503f7 100644
--- a/ejbca/locale/nb/fusiondirectory.po
+++ b/ejbca/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/nl/fusiondirectory.po b/ejbca/locale/nl/fusiondirectory.po
index 3b3a72a169315cbe1aae76ee45bf491ed975ce3a..0d85a462cd9f45cedc4827828782fcb3ccb4414d 100644
--- a/ejbca/locale/nl/fusiondirectory.po
+++ b/ejbca/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,19 +20,19 @@ msgstr ""
 
 #: config/ejbca/class_ejbcaConfig.inc:28
 msgid "EJBCA plugin configuration"
-msgstr ""
+msgstr "EJBCA plugin configuratie"
 
 #: config/ejbca/class_ejbcaConfig.inc:29
 msgid "FusionDirectory ejbca plugin configuration"
-msgstr ""
+msgstr "FusionDirectory ejbca plugin configuratie"
 
 #: config/ejbca/class_ejbcaConfig.inc:42
 msgid "EJBCA plugin"
-msgstr ""
+msgstr "EJBCA plugin"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "EJBCA RDN"
-msgstr ""
+msgstr "EJBCA RDN"
 
 #: config/ejbca/class_ejbcaConfig.inc:45
 msgid "Branch in which ejbca certificates are stored"
@@ -40,7 +41,7 @@ msgstr ""
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:29
 #: admin/ejbca/class_ejbcaManagement.inc:32
 msgid "EJBCA"
-msgstr ""
+msgstr "EJBCA"
 
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:30
 msgid "Assign EJBCA certificates to a user"
@@ -48,7 +49,7 @@ msgstr ""
 
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:48
 msgid "EJBCA certs"
-msgstr ""
+msgstr "EJBCA certs"
 
 #: admin/ejbca/certificates/class_ejbcaCertificates.inc:52
 msgid "Certificates associated to this object"
@@ -66,12 +67,12 @@ msgstr "Downloaden"
 #: admin/ejbca/class_ejbcaCertificate.inc:31
 #: admin/ejbca/class_ejbcaCertificate.inc:33
 msgid "EJBCA certificate"
-msgstr ""
+msgstr "EJBCA certificaat"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:47
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate"
-msgstr ""
+msgstr "Certificaat"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:51
 msgid "Name"
@@ -83,4 +84,4 @@ msgstr "Naam"
 
 #: admin/ejbca/class_ejbcaCertificate.inc:55
 msgid "Certificate content"
-msgstr ""
+msgstr "Inhoud van het certificaat"
diff --git a/ejbca/locale/pl/fusiondirectory.po b/ejbca/locale/pl/fusiondirectory.po
index f7ac73af454c671c7e09959be46f4012b5bb6c66..44ea59d805a54c17604fd401271ef250e8f84813 100644
--- a/ejbca/locale/pl/fusiondirectory.po
+++ b/ejbca/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/pt/fusiondirectory.po b/ejbca/locale/pt/fusiondirectory.po
index e941b62ec043c00ee2d82e89f957df6b7a77e156..1adbcb171afcb890f48339b27062ce57f171df27 100644
--- a/ejbca/locale/pt/fusiondirectory.po
+++ b/ejbca/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/pt_BR/fusiondirectory.po b/ejbca/locale/pt_BR/fusiondirectory.po
index 62c4a949a029ae6450b2cf51640e128946cf5ebb..b8e736f13292386e3f79308fa5259a63f534203b 100644
--- a/ejbca/locale/pt_BR/fusiondirectory.po
+++ b/ejbca/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/ru/fusiondirectory.po b/ejbca/locale/ru/fusiondirectory.po
index cff78326240925513095bf6c4859d5445bc14b2c..545ee841ac1e6f09405aaff63506d080c38523d1 100644
--- a/ejbca/locale/ru/fusiondirectory.po
+++ b/ejbca/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/ru@petr1708/fusiondirectory.po b/ejbca/locale/ru@petr1708/fusiondirectory.po
index 5143c14d064d2651d7ea6aa62dbb96e5fdd5b3ae..3d85d3a6679044c8a4b592c411a311c3429d74de 100644
--- a/ejbca/locale/ru@petr1708/fusiondirectory.po
+++ b/ejbca/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/sv/fusiondirectory.po b/ejbca/locale/sv/fusiondirectory.po
index b1ee16eab15adfff66ead026775d34227b177799..da0349cea693e33cf0df5d56949c6a5b4df42027 100644
--- a/ejbca/locale/sv/fusiondirectory.po
+++ b/ejbca/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/ug/fusiondirectory.po b/ejbca/locale/ug/fusiondirectory.po
index 299527cfc10374fc03dc2a82165cb4d4515d7e15..8d97fee5c234494fd2d645b30aaa2e6ea746ccf5 100644
--- a/ejbca/locale/ug/fusiondirectory.po
+++ b/ejbca/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/vi_VN/fusiondirectory.po b/ejbca/locale/vi_VN/fusiondirectory.po
index 27c6fc09602dc145ebe793e51f568a3ef2b272eb..54b224a80c0e1c8836ea6d1cd83a1326b14dc7fb 100644
--- a/ejbca/locale/vi_VN/fusiondirectory.po
+++ b/ejbca/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ejbca/locale/zh/fusiondirectory.po b/ejbca/locale/zh/fusiondirectory.po
index 3090a066b1f70f4df112328d899ed3c664d740f1..cc9a3a890e3c0116d0def56000eeac3e731a0072 100644
--- a/ejbca/locale/zh/fusiondirectory.po
+++ b/ejbca/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/fai/admin/fai/class_faiDiskEntry.inc b/fai/admin/fai/class_faiDiskEntry.inc
index 61574c41455921880da4cc28bf33afedd126d911..b6c2f3a315ae60b352c2ff8440e60878a498895e 100644
--- a/fai/admin/fai/class_faiDiskEntry.inc
+++ b/fai/admin/fai/class_faiDiskEntry.inc
@@ -92,8 +92,6 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
   /* Not saving anything into base node */
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
   }
 
   protected function getAttributeArrayValue($key, $value)
@@ -124,7 +122,7 @@ class DiskPartitionsAttribute extends DialogOrderedArrayAttribute
      *  lvm or raid compilations.
      */
     $list = array();
-    foreach ($this->plugin->parent->disks as $dname => $disk) {
+    foreach ($this->plugin->parent->disks as $disk) {
       if ($disk['FAIdiskType'] == 'lvm') {
         foreach ($disk['FAIlvmDevice'] as $partname) {
           $list[preg_replace('/:.*$/', '', $partname)][] = $disk;
@@ -370,7 +368,7 @@ class faiDiskEntry extends simplePlugin
   function execute()
   {
     $smarty = get_smarty();
-    $acl    = $this->getacl('FAIpartitions');
+    $acl    = $this->aclGetPermissions('FAIpartitions');
     $smarty->assign('FAIpartitionsACL', $acl);
     parent::execute();
 
@@ -489,7 +487,7 @@ class faiDiskEntry extends simplePlugin
         $used = array_merge($used, $disk['FAIlvmDevice']);
       }
 
-      foreach ($disk['partitions'] as $key => $part) {
+      foreach ($disk['partitions'] as $part) {
         // Add disks of raid arrays, to the used list.
         if ($disk['FAIdiskType'] == 'raid') {
           foreach (explode(',', $part['FAIpartitionSize']) as $rDevice) {
@@ -530,7 +528,7 @@ class faiDiskEntry extends simplePlugin
     if ($this->FAIdiskType == 'disk') {
       $types = array('logical' => array(), 'primary' => array());
       $types[$disk_to_add['FAIpartitionType']][$disk_to_add['FAIpartitionNr']] = 1;
-      foreach ($this->partitions as $key => $part) {
+      foreach ($this->partitions as $part) {
         $types[$part['FAIpartitionType']][$part['FAIpartitionNr']] = 1;
       }
 
diff --git a/fai/admin/fai/class_faiHook.inc b/fai/admin/fai/class_faiHook.inc
index 63e09545942cad213cc6f5f055e169b4c36662f2..db6022552c7dce17aa769cb342f71c1886574b55 100644
--- a/fai/admin/fai/class_faiHook.inc
+++ b/fai/admin/fai/class_faiHook.inc
@@ -83,7 +83,8 @@ class faiHook extends faiSimplePluginClass
               ),
               new FileTextAreaAttribute (
                 _('Script'), _('The script of this hook'),
-                'FAIscript', TRUE
+                'FAIscript', TRUE,
+                '.sh'
               ),
             ),
             FALSE, /* no order */
@@ -103,11 +104,18 @@ class faiHook extends faiSimplePluginClass
     $this->attributesAccess['hooks']->setLinearRendering(FALSE);
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['hooks']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 }
 ?>
diff --git a/fai/admin/fai/class_faiPackage.inc b/fai/admin/fai/class_faiPackage.inc
index 1014ce6e9a2dc18da82882f10178698e9b4270e9..e00ea5cf5d7f6b4a6f734246299e7ffa2c82854d 100644
--- a/fai/admin/fai/class_faiPackage.inc
+++ b/fai/admin/fai/class_faiPackage.inc
@@ -181,7 +181,6 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
 
   protected function handleAddAndEditValue()
   {
-    global $config;
     $id = $this->getHtmlId();
 
     foreach (array_keys($_POST) as $name) {
@@ -220,10 +219,9 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
   /* Special LDAP treatment that this attribute does after plugin ldap save */
   function postLdapSave ($ldap)
   {
-    /* FIXME Should be tested: empty strings/values, configuring a package and then delete it */
-
     /* First delete all old nodes */
-    $ldap->ls('objectClass=FAIdebconfInfo', $this->plugin->dn, array('dn'));
+    $ldap->cd($this->plugin->dn);
+    $ldap->search('objectClass=FAIdebconfInfo', array('dn'), 'one');
     $delete = array();
     while ($attrs = $ldap->fetch()) {
       $delete[] = $attrs['dn'];
@@ -265,23 +263,23 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
       return;
     }
 
-    /* If there are no packages, no need to do anything */
     if (empty($this->value)) {
+      // If there are no packages, no need to do anything
       return;
     }
 
     $attrs = array('distribution','package','version','section','description','timestamp','hastemplate');
 
-    /* packages names that are not already in the buffer */
+    // packages names that are not already in the buffer
     $packages = array_diff_key($this->value, $this->buffer);
 
     $release  = $this->plugin->FAIdebianRelease;
     $q        = new supportDaemon();
     $customs  = serviceRepository::getCustomReleases($release);
     for ($i = -1; (count($packages) > 0) && ($i < count($customs)); $i++) {
-      /* if release has been handled */
+      // if release has been handled
       if ($i >= 0) {
-        /* take the next custom */
+        // take the next custom
         $release = $customs[$i];
       }
       $ret = $q->FAI_get_packages($release, $attrs, array_keys($packages), -1, -1, TRUE);
@@ -294,7 +292,7 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
             $attr['DESCRIPTION'] = '';
           }
           $this->buffer[$attr['PACKAGE']] = $attr;
-           /* remove found packages */
+          // remove found packages
           unset($packages[$attr['PACKAGE']]);
           if ($i >= 0) {
             $this->FAIcustomRelease[$release] = $release;
@@ -338,7 +336,7 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
     /* Walk through configurations and append them to our list of ConfiguredPackages */
     while ($attr = $ldap->fetch()) {
       /* Skip objects, that are tagged as removed */
-      if (isset($object['FAIstate'][0])) {
+      if (isset($attr['FAIstate'][0])) {
         if (preg_match("/removed$/", $attr['FAIstate'][0])) {
           continue;
         }
@@ -353,7 +351,7 @@ class PackagesAttribute extends DialogOrderedArrayAttribute
         if (!in_array($attr['FAIvariableType'], array("multiselect"))) {
           $tmp['Value'] = $attr['FAIvariableContent'][0];
         } else {
-          $content = array();
+          $tmp['Value'] = array();
           unset($attr['FAIvariableContent']['count']);
           foreach ($attr['FAIvariableContent'] as $attr) {
             $tmp['Value'][] = $attr;
@@ -472,11 +470,18 @@ class faiPackage extends faiSimplePluginClass
     }
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['FAIpackage']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 
   function getServerInfos()
diff --git a/fai/admin/fai/class_faiPackageConfiguration.inc b/fai/admin/fai/class_faiPackageConfiguration.inc
index fe2d3a026217bf9fc6924321afdcef5dae124767..542dd92bc043e99b3697865d9dd38c1dd5826760 100644
--- a/fai/admin/fai/class_faiPackageConfiguration.inc
+++ b/fai/admin/fai/class_faiPackageConfiguration.inc
@@ -255,7 +255,7 @@ class faiPackageConfiguration extends simplePlugin
   function execute()
   {
     $smarty = get_smarty();
-    $acl    = $this->getacl('FAIpartitions');
+    $acl    = $this->aclGetPermissions('FAIpartitions');
     $smarty->assign('FAIpackageACL', $acl);
     return parent::execute().
       '<p class="plugbottom">'.
diff --git a/fai/admin/fai/class_faiPartition.inc b/fai/admin/fai/class_faiPartition.inc
index 4cf52183d3fd95dbc338c8c8aa682950b2da4e6b..1e5c73a8dd2e9873a9ff734da3c62ec5e66cd824 100644
--- a/fai/admin/fai/class_faiPartition.inc
+++ b/fai/admin/fai/class_faiPartition.inc
@@ -358,7 +358,7 @@ class faiPartition extends simplePlugin
       $disablePrimary = FALSE;
       if (!$object || ($object['FAIpartitionType'] == 'logical')) {
         $types = array('logical' => array(), 'primary' => array());
-        foreach ($this->parent->partitions as $key => $part){
+        foreach ($this->parent->partitions as $part){
           $types[$part['FAIpartitionType']][$part['FAIpartitionNr']] = 1;
         }
         if (count($types['logical']) && (count($types['primary']) >= 3)) {
@@ -445,7 +445,7 @@ class faiPartition extends simplePlugin
   function execute()
   {
     $smarty = get_smarty();
-    $acl    = $this->getacl('FAIpartitions');
+    $acl    = $this->aclGetPermissions('FAIpartitions');
     $smarty->assign('FAIpartitionsACL', $acl);
     parent::execute();
 
@@ -521,7 +521,7 @@ class faiPartition extends simplePlugin
         $used = array_merge($used,$disk['FAIlvmDevice']);
       }
 
-      foreach ($disk['partitions'] as $key => $part) {
+      foreach ($disk['partitions'] as $part) {
         // Add disks of raid arrays, to the used list.
         if ($disk['FAIdiskType'] == 'raid') {
           foreach (explode(',', $part['FAIpartitionSize']) as $rDevice) {
diff --git a/fai/admin/fai/class_faiPartitionTable.inc b/fai/admin/fai/class_faiPartitionTable.inc
index ea64b7ab283900db9703c90746083d5b19df4f08..80f37489a9dfe5a4c646e574c8d3e586dd7c2fee 100644
--- a/fai/admin/fai/class_faiPartitionTable.inc
+++ b/fai/admin/fai/class_faiPartitionTable.inc
@@ -138,11 +138,14 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
     if (isset($attrs['dn'])) {
       /* Fetch disks */
       $ldap = $config->get_ldap_link();
-      $ldap->ls($this->diskFilter, $attrs['dn']);
+      $ldap->cd($attrs['dn']);
+      $ldap->search($this->diskFilter, array('*'), 'one');
       $this->value = array();
       while ($subattrs = $ldap->fetch()) {
-        $diskInfos = array('description' => '', 'FAIdiskType' => 'disk');
-        $diskInfos['description']  = '';
+        $diskInfos = array(
+          'description' => '',
+          'FAIdiskType' => 'disk'
+        );
         foreach (array('cn', 'description','FAIdiskType') as $attr) {
           if (isset($subattrs[$attr][0])) {
             $diskInfos[$attr] = $subattrs[$attr][0];
@@ -171,9 +174,13 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
       }
       /* Fetch partitions */
       foreach ($this->value as $name => $disk) {
-        $ldap->ls($this->partFilter, $disk['dn']);
+        $ldap->cd($disk['dn']);
+        $ldap->search($this->partFilter, array('*'), 'one');
         while ($obj = $ldap->fetch()) {
-          $partitionInfos = array();
+          $partitionInfos = array(
+            'description'       => '',
+            'FAIpartitionSize'  => '',
+          );
           foreach ($this->partitionAttributes as $attr) {
             if (isset($obj[$attr][0])) {
               $partitionInfos[$attr] = $obj[$attr][0];
@@ -190,15 +197,14 @@ class PartitionTableAttribute extends DialogOrderedArrayAttribute
   /* Not saving anything into base node */
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
   }
 
   /* Special LDAP treatment that this attribute does after plugin ldap save */
   function postLdapSave ($ldap)
   {
     /* First delete all old nodes */
-    $ldap->ls($this->diskFilter, $this->plugin->dn, array('dn'));
+    $ldap->cd($this->plugin->dn);
+    $ldap->search($this->diskFilter, array('dn'), 'one');
     $delete = array();
     while ($attrs = $ldap->fetch()) {
       $delete[] = $attrs['dn'];
@@ -334,11 +340,18 @@ class faiPartitionTable extends faiSimplePluginClass
     $this->attributesAccess['cn']->setUnique(TRUE);
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['FAIpartitions']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 
   function getUsedDiskNames()
diff --git a/fai/admin/fai/class_faiScript.inc b/fai/admin/fai/class_faiScript.inc
index a8de21d828a1198f2f4b4c92a2e498821ef70e91..ff0c9193ce97b474cec99f5f2547c1c571d42454 100644
--- a/fai/admin/fai/class_faiScript.inc
+++ b/fai/admin/fai/class_faiScript.inc
@@ -82,7 +82,8 @@ class faiScript extends faiSimplePluginClass
               ),
               new FileTextAreaAttribute (
                 _('Script'), _('The script itself'),
-                'FAIscript', TRUE
+                'FAIscript', TRUE,
+                '.sh'
               ),
             ),
             FALSE, /* no order */
@@ -102,11 +103,18 @@ class faiScript extends faiSimplePluginClass
     $this->attributesAccess['scripts']->setLinearRendering(FALSE);
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['scripts']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 }
 ?>
diff --git a/fai/admin/fai/class_faiTemplate.inc b/fai/admin/fai/class_faiTemplate.inc
index 19d8417e00ddc24c170de91be9d071e9a96720d0..d115f61d60f79e76aa5db1b4e4cc08d66e824d5a 100644
--- a/fai/admin/fai/class_faiTemplate.inc
+++ b/fai/admin/fai/class_faiTemplate.inc
@@ -45,7 +45,8 @@ class FAITemplateFilesAttribute extends DialogOrderedArrayAttribute
     global $config;
     if (isset($attrs['dn'])) {
       $ldap = $config->get_ldap_link();
-      $ldap->ls($this->templateFilter, $attrs['dn']);
+      $ldap->cd($attrs['dn']);
+      $ldap->search($this->templateFilter, array('*'), 'one');
       $this->value = array();
       while ($subattrs = $ldap->fetch()) {
         $attrsWrapper = new stdClass();
@@ -65,15 +66,14 @@ class FAITemplateFilesAttribute extends DialogOrderedArrayAttribute
   /* Not saving anything into base node */
   function fillLdapValue (&$attrs)
   {
-    /* Remove crap made by plugin */
-    unset ($attrs[$this->getLdapName()]);
   }
 
   /* Special LDAP treatment that this attribute does after plugin ldap save */
   function postLdapSave ($ldap)
   {
     /* First delete all old nodes */
-    $ldap->ls($this->templateFilter, $this->plugin->dn, array('dn'));
+    $ldap->cd($this->plugin->dn);
+    $ldap->search($this->templateFilter, array('dn'), 'one');
     $delete = array();
     while ($attrs = $ldap->fetch()) {
       $delete[] = $attrs['dn'];
@@ -90,11 +90,6 @@ class FAITemplateFilesAttribute extends DialogOrderedArrayAttribute
     }
   }
 
-  protected function handleEdit($key)
-  {
-    parent::handleEdit($key);
-  }
-
   function compute_sub_dn ($value)
   {
     return 'cn='.$value['cn'].','.$this->plugin->dn;
@@ -192,11 +187,18 @@ class faiTemplate extends faiSimplePluginClass
     );
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['templateFiles']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 }
 ?>
diff --git a/fai/admin/fai/class_faiVariable.inc b/fai/admin/fai/class_faiVariable.inc
index 968e96c59da8c295ba3b1e2c31da16adf120be96..1c87cee58a108cf1d4b06ad34f26fd85a014e23b 100644
--- a/fai/admin/fai/class_faiVariable.inc
+++ b/fai/admin/fai/class_faiVariable.inc
@@ -95,11 +95,18 @@ class faiVariable extends faiSimplePluginClass
     $this->attributesAccess['variables']->setLinearRendering(FALSE);
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['variables']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 }
 ?>
diff --git a/fai/admin/fai/packageSelect/class_packageSelect.inc b/fai/admin/fai/packageSelect/class_packageSelect.inc
index 73a6e414a9d9fab50fe18b8a1a3c704ec884f332..f6699a2a623315fbff832c3ab8d181bb58e3bf69 100644
--- a/fai/admin/fai/packageSelect/class_packageSelect.inc
+++ b/fai/admin/fai/packageSelect/class_packageSelect.inc
@@ -45,9 +45,11 @@ class packageSelect extends simpleSelectManagement
   {
     $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) {
+    foreach ($act['targets'] as $dn) {
       $ret[] = $headpage->getEntry($dn);
     }
     return $ret;
diff --git a/fai/admin/fai/packageSelect/selectPackage-filter.xml b/fai/admin/fai/packageSelect/selectPackage-filter.xml
index febabf2851e867ae9d2390e17fa35d5335f52c2a..99a51e9af3c65d7b3628025c9ed077d009679e8a 100644
--- a/fai/admin/fai/packageSelect/selectPackage-filter.xml
+++ b/fai/admin/fai/packageSelect/selectPackage-filter.xml
@@ -2,7 +2,7 @@
 
 <filterdef>
   <definition>
-    <category>groups</category>
+    <category>fai</category>
     <template>../plugins/admin/fai/packageSelect/selectPackage-filter.tpl</template>
     <initial>true</initial>
   </definition>
@@ -27,13 +27,6 @@
     <unset></unset>
     <set>*$</set>
     <alphabet>true</alphabet>
-    <autocomplete>
-      <backend>FAIPackages</backend>
-      <filter>$NAME</filter>
-      <attribute>PACKAGE</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
   </element>
 
 </filterdef>
diff --git a/fai/admin/systems/class_faiLogView.inc b/fai/admin/systems/class_faiLogView.inc
index 53e42c9817d81f543440c90b0135624ce5d918d7..d5b6399b74e53a84ecbe5474bc4c3468a8641d38 100644
--- a/fai/admin/systems/class_faiLogView.inc
+++ b/fai/admin/systems/class_faiLogView.inc
@@ -29,7 +29,7 @@ class AvailableLogsAttribute extends Attribute
       'file'      => '',
       'time'      => '',
       'sort_by'   => 'time',
-      /* TRUE means up */
+      // TRUE means up
       'sort_up'  => TRUE
     );
     parent::__construct ('', $description, $ldapName, FALSE, $value, $acl);
diff --git a/fai/admin/systems/services/repository/class_serviceRepository.inc b/fai/admin/systems/services/repository/class_serviceRepository.inc
index 0763651f5625b7d3376888b85fb2ae2da74e02a8..c88c0a5c790a9957242cfef908ecfd7075bafe4e 100644
--- a/fai/admin/systems/services/repository/class_serviceRepository.inc
+++ b/fai/admin/systems/services/repository/class_serviceRepository.inc
@@ -178,8 +178,10 @@ class serviceRepository extends simpleService
               _('Repositories this server hosts'),
               'FAIrepository'
             ),
+            // no order
             FALSE,
             array(),
+            // edit button
             TRUE
           )
         )
@@ -199,16 +201,16 @@ class serviceRepository extends simpleService
     if (!isset($attrs['FAIrepository'])) {
       return FALSE;
     }
-    if (preg_match('/'.preg_quote($distribution, '/').'$/', $attrs['FAIrepository'][0])) {
-      return TRUE;
-    } else {
-      return FALSE;
-    }
+    return preg_match('/'.preg_quote($distribution, '/').'$/', $attrs['FAIrepository'][0]);
   }
 
-  function ldap_save($clean = TRUE)
+  function ldap_save()
   {
-    parent::ldap_save($clean);
+    $errors = parent::ldap_save();
+
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     $repos  = $this->attributesAccess['FAIrepository']->getArrayValues();
     $done   = array();
@@ -219,6 +221,8 @@ class serviceRepository extends simpleService
         $done[$release] = TRUE;
       }
     }
+
+    return $errors;
   }
 
   static function createBranch ($distribution, $release)
@@ -340,7 +344,8 @@ class serviceRepository extends simpleService
     global $config;
 
     $ldap = $config->get_ldap_link();
-    $ldap->ls('(objectClass=FAIbranch)', 'ou='.$distribution.','.get_ou('faiBaseRDN').$config->current['BASE'], array('ou'));
+    $ldap->cd('ou='.$distribution.','.get_ou('faiBaseRDN').$config->current['BASE']);
+    $ldap->search('(objectClass=FAIbranch)', array('ou'), 'one');
 
     $list = array();
     while ($release = $ldap->fetch()) {
diff --git a/fai/contrib/openldap/fai.schema b/fai/contrib/openldap/fai.schema
index c7ac7dc0c03aca261408c452265f4fbf7c89a07f..33554157a7167970160988cf74daa0936eaae65a 100644
--- a/fai/contrib/openldap/fai.schema
+++ b/fai/contrib/openldap/fai.schema
@@ -268,58 +268,40 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.5.23 NAME 'FAIpartitionFlags'
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
-# Name       : FAIdebianMirror
-# Description: Used for bootstrap sources.list settings. It contains
-#              the mirror server url.
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.24 NAME 'FAIdebianMirror'
-    DESC 'TODO'
+    DESC 'The mirror server url. Used for bootstrap sources.list settings.'
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
-# Name       : FAIdebianRelease
-# Description: Used for bootstrap sources.list settings. It contains
-#              the release.
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.25 NAME 'FAIdebianRelease'
-    DESC 'TODO'
+    DESC 'The release. Used for bootstrap sources.list settings.'
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
-# Name       : FAIcustomRelease
-# Description: Used for bootstrap sources.list settings. It contains
-#              the addictional custom releases.
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.36 NAME 'FAIcustomRelease'
-    DESC 'TODO'
+    DESC 'The addictional custom releases. Used for bootstrap sources.list settings.'
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-# Name       : FAIdebianSection
-# Description: Used for bootstrap sources.list settings. It contains
-#              the section. Multiple Sections get appended.
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.26 NAME 'FAIdebianSection'
-    DESC 'TODO'
+    DESC 'The section. Multiple Sections get appended. Used for bootstrap sources.list settings.'
     EQUALITY caseIgnoreIA5Match
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-# Name       : FAIrepository
-# Description: Used to store repository settings
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.27 NAME 'FAIrepository'
-    DESC 'TODO'
+    DESC 'Used to store repository settings'
     EQUALITY caseIgnoreIA5Match
     SUBSTR caseIgnoreIA5SubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-# Name       : FAIstate
-# Description: Used to store repository state (branched/freezed)
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.28 NAME 'FAIstate'
-    DESC 'TODO'
+    DESC 'Used to store repository state (branched/freezed)'
     EQUALITY caseIgnoreIA5Match
     SUBSTR caseIgnoreIA5SubstringsMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-# Name       : FAIrelease
-# Description: Used to store the release
 attributetype ( 1.3.6.1.4.1.10098.1.1.5.29 NAME 'FAIrelease'
-    DESC 'TODO'
+    DESC 'Used to store the release'
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 # Name       : FAIpartitionMethod
diff --git a/fai/locale/ar/fusiondirectory.po b/fai/locale/ar/fusiondirectory.po
index e979aafa3d3d55d1a5502da2d710ccdada52fce1..64d309ce4b2fefdeec9684a2ae44ee4a0dd366b2 100644
--- a/fai/locale/ar/fusiondirectory.po
+++ b/fai/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/ca/fusiondirectory.po b/fai/locale/ca/fusiondirectory.po
index 1ac6ecccf6b42b3593640f57b287e96dfe9794bd..95d5baae3235e0140574662ed9944e92bc413fbd 100644
--- a/fai/locale/ca/fusiondirectory.po
+++ b/fai/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Error"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/cs_CZ/fusiondirectory.po b/fai/locale/cs_CZ/fusiondirectory.po
index ada3010b2791240feee5f08b2c134419772e24bf..da625a97dbd79e5893ba6ad5e024da7b4132a2fc 100644
--- a/fai/locale/cs_CZ/fusiondirectory.po
+++ b/fai/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,7 +55,7 @@ msgstr "s"
 
 #: admin/systems/class_faiStartup.inc:65
 msgid "Full automated installation"
-msgstr "PlnÄ› samoÄinnÃ¡ instalace (FAI)"
+msgstr "PlnÄ› samoÄinnÃ¡ instalace"
 
 #: admin/systems/class_faiStartup.inc:83
 msgid "FAI settings"
@@ -66,13 +67,14 @@ 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
-msgstr "VydÃ¡nÃ"
+msgstr "vydÃ¡nÃ"
 
 #: admin/systems/class_faiStartup.inc:91
 msgid "FAI debian release to be installed on this computer"
-msgstr "FAI vydÃ¡nÃ systÃ©mu Debian, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no na tento poÄÃtaÄ"
+msgstr ""
+"FAI vydÃ¡nÃ systÃ©mu Debian, kterÃ© mÃ¡ bÃ½t nainstalovÃ¡no na tento poÄÃtaÄ"
 
 #: admin/systems/class_faiStartup.inc:95
 msgid "Profil"
@@ -82,9 +84,9 @@ 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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
-msgstr "RepozitÃ¡Å™"
+msgstr "repozitÃ¡Å™"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "FAI Debian repository to be used for installation"
@@ -92,15 +94,15 @@ msgstr "FAI repozitÃ¡Å™ systÃ©mu Debian, kterÃ½ mÃ¡ bÃ½t pouÅ¾it pro instalaci"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:31
 msgid "URL"
-msgstr "URL adresa"
+msgstr "URL"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:31
 msgid "Repository url"
-msgstr "URL adresa repozitÃ¡Å™e"
+msgstr "Adresa repozitÃ¡Å™e"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:35
 msgid "Parent server"
-msgstr "NadÅ™azenÃ½ server"
+msgstr "nadÅ™azenÃ½ server"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:35
 msgid "Parent repository server"
@@ -111,7 +113,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:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "oddÃly"
 
@@ -134,7 +136,7 @@ msgstr "MÃstnÃ zrcadlo"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Is this mirror a local or a network mirror?"
-msgstr "Je toto zrcadlo mÃstnÃ Äi sÃÅ¥ovÃ©?"
+msgstr "Je toto zrcadlo mÃstnÃ Äi sÃÅ¥ovÃ©"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:66
 msgid "Architectures"
@@ -176,14 +178,14 @@ msgstr "RepozitÃ¡Å™e"
 msgid "Repositories this server hosts"
 msgstr "RepozitÃ¡Å™e, kterÃ© se nachÃ¡zejÃ na tomto serveru"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:28
 msgid "Argonaut FAI monitor"
@@ -196,15 +198,16 @@ msgstr "NastavenÃ dohledovÃ¡nÃ v Argonaut FAI"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Port na kterÃ©m mÃ¡ argonaut-fai-monitor oÄekÃ¡vat spojenÃ. VÃ½chozÃ je 4711."
+msgstr ""
+"Port na kterÃ©m mÃ¡ argonaut-fai-monitor oÄekÃ¡vat spojenÃ. VÃ½chozÃ je 4711."
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr "PÅ™ekroÄenÃ ÄasovÃ©ho limitu"
+msgstr "ÄasovÃ½ limit"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -216,11 +219,12 @@ msgstr "CertifikÃ¡t cert. autority"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
 msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "UmÃstÄ›nÃ certifikÃ¡tu cert. autority na dohledovacÃm serveru Argonaut FAI"
+msgstr ""
+"UmÃstÄ›nÃ certifikÃ¡tu cert. autority na dohledovacÃm serveru Argonaut FAI"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
 msgid "Log directory"
-msgstr "SloÅ¾ka pro zÃ¡znamy protokolÅ¯"
+msgstr "sloÅ¾ka pro protokolovacÃ zÃ¡znamy"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
 msgid "Directory in which argonaut-fai-monitor will store its log"
@@ -236,16 +240,16 @@ msgstr "SeÅ™adit vzestupnÄ›"
 
 #: admin/systems/class_faiLogView.inc:71
 msgid "File"
-msgstr "Soubor"
+msgstr "soubor"
 
 #: admin/systems/class_faiLogView.inc:72
 msgid "Date"
-msgstr "Datum"
+msgstr "datum"
 
 #: admin/systems/class_faiLogView.inc:151
 #: admin/systems/class_faiLogView.inc:154
 msgid "Available logs"
-msgstr "Protokoly k dispozici"
+msgstr "ProvoznÃ zÃ¡znamy k dispozici"
 
 #: admin/systems/class_faiLogView.inc:159
 msgid "Selected log"
@@ -253,20 +257,20 @@ msgstr "VybranÃ½ protokol"
 
 #: admin/systems/class_faiLogView.inc:163
 msgid "Content of the selected log"
-msgstr "Obsah zvolenÃ©ho protokolu"
+msgstr "Obsah zvolenÃ©ho provoznÃho zÃ¡znamu"
 
 #: admin/systems/class_faiLogView.inc:175
 msgid "FAI Logs"
-msgstr "Protokoly FAI"
+msgstr "ProvoznÃ zÃ¡znamy FAI"
 
 #: admin/systems/class_faiLogView.inc:176
 msgid "FAI Logs Viewer"
-msgstr "ProhlÃÅ¾eÄ protokolu FAI"
+msgstr "ProhlÃÅ¾eÄ provoznÃch zÃ¡znamÅ¯ FAI"
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
 #: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
@@ -279,63 +283,63 @@ msgstr "ZvolenÃ½ soubor: %s"
 
 #: admin/fai/class_faiPartitionTable.inc:111
 msgid "Add RAID"
-msgstr "PÅ™idat RAID"
+msgstr "pÅ™idat RAID"
 
 #: admin/fai/class_faiPartitionTable.inc:115
 msgid "Add LVM"
 msgstr "PÅ™idat LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
-msgstr "Tabulka rozdÄ›lenÃ jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
+msgstr "tabulka rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
-msgstr "Vlastnosti"
+msgstr "vlastnosti"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
-msgstr "NÃ¡zev tÅ™Ãdy"
+msgstr "nÃ¡zev tÅ™Ãdy"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 admin/fai/class_faiProfile.inc:52
 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: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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Popis"
+msgstr "popis"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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 "StruÄnÃ½ popis tÅ™Ãdy"
 
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
-msgstr "Jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
+msgstr "ÃºloÅ¾nÃ© jednotky"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr "OddÃly v tÃ©to tÅ™ÃdÄ›"
 
@@ -353,7 +357,7 @@ msgstr "StruÄnÃ½ popis souboru"
 
 #: admin/fai/class_faiTemplateEntry.inc:155
 msgid "Template attributes"
-msgstr "Atributy Å¡ablony"
+msgstr "vlastnosti Å¡ablony"
 
 #: admin/fai/class_faiTemplateEntry.inc:159
 msgid "Template file content"
@@ -369,15 +373,15 @@ msgstr "VlastnÃk a skupina souboru"
 
 #: admin/fai/class_faiTemplateEntry.inc:166
 msgid "Owner"
-msgstr "VlastnÃk"
+msgstr "vlastnÃk"
 
 #: admin/fai/class_faiTemplateEntry.inc:166
 msgid "File owner"
-msgstr "VlastnÃk souboru"
+msgstr "vlastnÃk souboru"
 
 #: admin/fai/class_faiTemplateEntry.inc:171
 msgid "Group"
-msgstr "Skupina"
+msgstr "skupina"
 
 #: admin/fai/class_faiTemplateEntry.inc:171
 msgid "File group"
@@ -385,7 +389,7 @@ msgstr "Skupina souboru"
 
 #: admin/fai/class_faiTemplateEntry.inc:180
 msgid "Access"
-msgstr "PÅ™Ãstup"
+msgstr "pÅ™Ãstup"
 
 #: admin/fai/class_faiTemplateEntry.inc:180
 msgid "Access rights"
@@ -397,151 +401,151 @@ msgstr "OznaÄit k instalaci"
 
 #: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
-msgstr "OznaÄit k odstranÄ›nÃ"
+msgstr "OznaÄit k odebrÃ¡nÃ"
 
 #: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
 msgstr "Upravit nastavenÃ"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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"
+msgstr "SluÅ¾ba infrastruktury"
 
-#: admin/fai/class_faiPackage.inc:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "NeznÃ¡mÃ© balÃÄky"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
-msgstr "BalÃÄek"
+msgstr "balÃÄek"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
-msgstr "Seznam balÃÄkÅ¯ pro FAI instalaci"
+msgstr "seznam balÃÄkÅ¯ pro FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "FAI balÃÄek"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "TÃ½kajÃcÃ se vydÃ¡nÃ distribuce Debian"
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Sekce, kterÃ½ch se tÃ½kÃ¡"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "zpÅ¯sob instalace"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 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:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "balÃÄky"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr "BalÃÄky v tÃ©to tÅ™ÃdÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "Å¡ifrovanÃ©"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
-msgstr "zaveditelnÃ©"
+msgstr "zaveditelnÃ© (bootovatelnÃ©)"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "zachovat"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
-msgstr "PoloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
+msgstr "poloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
-msgstr "PoloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pro FAI"
+msgstr "poloÅ¾ka tabulky rozdÄ›lenÃ ÃºloÅ¾iÅ¡tÄ› pro FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
-msgstr "ZaÅ™ÃzenÃ"
+msgstr "zaÅ™ÃzenÃ"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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 "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "poloÅ¾ka v /etc/fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
-msgstr "Å tÃtek"
+msgstr "jmenovka"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
-msgstr "JedineÄnÃ½ identifikÃ¡tor uÅ¾ivatele (UUID)"
+msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "OznaÄenÃ jednotky datovÃ©ho ÃºloÅ¾iÅ¡tÄ›"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "PoloÅ¾ky oddÃlÅ¯"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "KombinovanÃ© fyzickÃ© oddÃly"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -576,39 +580,39 @@ msgstr "StruÄnÃ½ popis promÄ›nnÃ©"
 
 #: admin/fai/class_faiHook.inc:77
 msgid "Task"
-msgstr "Ãškol"
+msgstr "Ãºkol"
 
 #: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
 msgid "Script"
-msgstr "Skript"
+msgstr "skript"
 
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr "Skript tohoto hÃ¡Äku"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr "Hned nÄ›kolik souborÅ¯ se vyskytuje v tomto umÃstÄ›nÃ: %s"
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
-msgstr "Å ablona"
+msgstr "Å¡ablona"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
-msgstr "Å ablona pro FAI"
+msgstr "Å¡ablona pro FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr "NÃ¡zev tÅ™Ãdy Å¡ablon"
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr "Soubory se Å¡ablonami"
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr "Soubory Å¡ablon v tÃ©to tÅ™ÃdÄ›"
 
@@ -628,7 +632,7 @@ msgstr ""
 
 #: admin/fai/class_faiPackageConfiguration.inc:172
 msgid "Warning"
-msgstr "VarovÃ¡nÃ"
+msgstr "varovÃ¡nÃ"
 
 #: admin/fai/class_faiPackageConfiguration.inc:173
 #, php-format
@@ -677,7 +681,7 @@ msgstr "PB"
 
 #: admin/fai/class_faiPartition.inc:144
 msgid "Minimum partition size"
-msgstr "NejmenÅ¡Ã moÅ¾nÃ¡ velikost oddÃlu"
+msgstr "nejmenÅ¡Ã velikost oddÃlu"
 
 #: admin/fai/class_faiPartition.inc:144
 msgid "Maximum partition size"
@@ -697,20 +701,20 @@ msgstr "OddÃl"
 
 #: admin/fai/class_faiPartition.inc:234
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: admin/fai/class_faiPartition.inc:234
 msgid "Partition type"
-msgstr "Typ oddÃlu"
+msgstr "typ oddÃlu"
 
 #: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:374
 msgid "Primary"
-msgstr "HlavnÃ"
+msgstr "hlavnÃ"
 
 #: admin/fai/class_faiPartition.inc:237 admin/fai/class_faiPartition.inc:371
 #: admin/fai/class_faiPartition.inc:375
 msgid "Logical"
-msgstr "LogickÃ©"
+msgstr "logickÃ½"
 
 #: admin/fai/class_faiPartition.inc:240
 msgid "Partition name"
@@ -718,7 +722,7 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:250
 msgid "Size"
-msgstr "Velikost"
+msgstr "velikost"
 
 #: admin/fai/class_faiPartition.inc:250
 msgid "Size of this partition"
@@ -798,7 +802,7 @@ msgstr "ext4"
 
 #: admin/fai/class_faiPartition.inc:314
 msgid "reiser fs"
-msgstr "reiserfs"
+msgstr "reiser fs"
 
 #: admin/fai/class_faiPartition.inc:314
 msgid "xfs"
@@ -822,7 +826,7 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:321
 msgid "Mount point"
-msgstr "PÅ™ÃpojnÃ½ bod"
+msgstr "pÅ™ÃpojnÃ½ bod"
 
 #: admin/fai/class_faiPartition.inc:321
 msgid "Mount point for this partition"
@@ -830,7 +834,7 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:327
 msgid "Options"
-msgstr "MoÅ¾nosti"
+msgstr "volby"
 
 #: admin/fai/class_faiPartition.inc:330
 msgid "Create options"
@@ -850,7 +854,7 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:338
 msgid "Mount options"
-msgstr "PÅ™edvolby pÅ™ipojovÃ¡nÃ (mount)"
+msgstr "volby pÅ™ipojovÃ¡nÃ"
 
 #: admin/fai/class_faiPartition.inc:338
 msgid "Filesystem mount options"
@@ -874,16 +878,16 @@ msgstr "RAID 6"
 
 #: admin/fai/class_faiPartition.inc:478
 msgid "Raid arrays must contain at least two partitions!"
-msgstr "Pole RAID nemÅ¯Å¾e bÃ½t tvoÅ™eno mÃ©nÄ› neÅ¾ dvÄ›ma oddÃly!"
+msgstr "Pole RAID nelze vytvoÅ™it z mÃ©nÄ› neÅ¾ dvou oddÃlÅ¯!"
 
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Pole RAID 0 mÅ¯Å¾e tvoÅ™eno jedinÄ› a pouze dvÄ›ma oddÃly!"
+msgstr "Pole RAID 0 mÅ¯Å¾e obsahovat pouze a jedinÄ› dva oddÃly!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
-msgstr "Profil"
+msgstr "profil"
 
 #: admin/fai/class_faiProfile.inc:31
 msgid "FAI profile"
@@ -895,7 +899,7 @@ msgstr "Sada nastavenÃ FAI"
 
 #: admin/fai/class_faiProfile.inc:63
 msgid "FAI classes"
-msgstr "TÅ™Ãdy FAI"
+msgstr "druhy FAI"
 
 #: admin/fai/class_faiProfile.inc:63
 msgid "FAI classes which are part of this profile"
@@ -915,19 +919,19 @@ msgstr "Pro vytvoÅ™enÃ tÄ›chto pÅ™idejte alespoÅˆ jeden repozitÃ¡Å™."
 
 #: admin/fai/class_faiVariable.inc:28
 msgid "Variable"
-msgstr "PromÄ›nnÃ¡"
+msgstr "promÄ›nnÃ¡"
 
 #: admin/fai/class_faiVariable.inc:29 admin/fai/class_faiVariable.inc:32
 msgid "FAI variable"
-msgstr "PromÄ›nnÃ¡ pro FAI"
+msgstr "promÄ›nnÃ¡ pro FAI"
 
 #: admin/fai/class_faiVariable.inc:61
 msgid "Variables"
-msgstr "PromÄ›nnÃ©"
+msgstr "promÄ›nnÃ©"
 
 #: admin/fai/class_faiVariable.inc:77
 msgid "Content"
-msgstr "Obsah"
+msgstr "obsah"
 
 #: admin/fai/class_faiVariable.inc:77
 msgid "The content of the variable"
@@ -935,19 +939,20 @@ msgstr "Obsah promÄ›nnÃ©"
 
 #: admin/fai/class_faiScript.inc:31 admin/fai/class_faiScript.inc:34
 msgid "FAI script"
-msgstr "Skript FAI"
+msgstr "skript FAI"
 
 #: admin/fai/class_faiScript.inc:63
 msgid "Scripts"
-msgstr "Skripty"
+msgstr "skripty"
 
 #: admin/fai/class_faiScript.inc:79
 msgid "Priority"
-msgstr "PoÅ™adÃ pÅ™ednosti"
+msgstr "priorita"
 
 #: admin/fai/class_faiScript.inc:79
 msgid "Priority of this script (smaller is done first)"
-msgstr "PoÅ™adÃ pÅ™ednosti tohoto skriptu (niÅ¾Å¡Ã ÄÃslo znamenÃ¡ dÅ™ÃvÄ›jÅ¡Ã spuÅ¡tÄ›nÃ)"
+msgstr ""
+"PoÅ™adÃ pÅ™ednosti tohoto skriptu (niÅ¾Å¡Ã ÄÃslo znamenÃ¡ dÅ™ÃvÄ›jÅ¡Ã spuÅ¡tÄ›nÃ)"
 
 #: admin/fai/class_faiScript.inc:84
 msgid "The script itself"
@@ -955,15 +960,15 @@ msgstr "Skript samotnÃ½"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Vyberte poÅ¾adovanÃ© poloÅ¾ky"
+msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:48
 msgid "Version"
-msgstr "Verze"
+msgstr "verze"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:2
 msgid "Filter"
-msgstr "Filtr"
+msgstr "filtr"
 
 #: admin/fai/packageSelect/selectPackage-filter.tpl.c:5
 msgid "A maximum of 200 entries will be shown here."
diff --git a/fai/locale/de/fusiondirectory.po b/fai/locale/de/fusiondirectory.po
index 38eb4b6c14e30cb9102985a80b8649c0dc3b1e74..a09b0c6413a0686fbccd2dbe7c9e84bf3106b16a 100644
--- a/fai/locale/de/fusiondirectory.po
+++ b/fai/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:49+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,17 +63,20 @@ msgstr "FAI-Einstellungen"
 
 #: admin/systems/class_faiStartup.inc:87
 msgid "FAI profil and release to be applied to this computer"
-msgstr "FAI Profil und VerÃ¶ffentlichung, die auf diesen Rechner angewendet werden soll"
+msgstr ""
+"FAI Profil und VerÃ¶ffentlichung, die auf diesen Rechner angewendet werden "
+"soll"
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Release"
 
 #: admin/systems/class_faiStartup.inc:91
 msgid "FAI debian release to be installed on this computer"
-msgstr "FAI Debian-VerÃ¶ffentlichung, die auf diesen Rechner installiert werden soll"
+msgstr ""
+"FAI Debian-VerÃ¶ffentlichung, die auf diesen Rechner installiert werden soll"
 
 #: admin/systems/class_faiStartup.inc:95
 msgid "Profil"
@@ -82,13 +86,14 @@ 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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Repository"
 
 #: admin/systems/class_faiStartup.inc:103
 msgid "FAI Debian repository to be used for installation"
-msgstr "FAI Debian-Repository, welches fÃ¼r die Installation verwendet werden soll"
+msgstr ""
+"FAI Debian-Repository, welches fÃ¼r die Installation verwendet werden soll"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:31
 msgid "URL"
@@ -96,7 +101,7 @@ msgstr "URL"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:31
 msgid "Repository url"
-msgstr "Repositoriums-URL"
+msgstr "Repository URL"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:35
 msgid "Parent server"
@@ -111,7 +116,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Sektionen"
 
@@ -126,7 +131,9 @@ msgstr "Mirror-Modus"
 #: admin/systems/services/repository/class_serviceRepository.inc:52
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Ist dieser Mirror ein Installationsrepository? Ist sein Release ein eigenes erstelltes?"
+msgstr ""
+"Ist dieser Mirror ein Installationsrepository? Ist sein Release ein eigenes "
+"erstelltes?"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Local mirror"
@@ -176,12 +183,12 @@ msgstr "Repositories"
 msgid "Repositories this server hosts"
 msgstr "Repositories, die dieser Server bereitstellt"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -196,7 +203,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "Port"
-msgstr "Port"
+msgstr "Anschluss"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
@@ -204,7 +211,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr "ZeitÃ¼berschreitung"
+msgstr "Wartezeit"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +271,7 @@ msgid "FAI Logs Viewer"
 msgstr "FAI-Protokollbetrachter"
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Fehler"
 
@@ -285,57 +292,57 @@ msgstr "RAID hinzufÃ¼gen"
 msgid "Add LVM"
 msgstr "LVM hinzufÃ¼gen"
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Partitionstabelle"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
-#: 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Klassen-Name"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 admin/fai/class_faiProfile.inc:52
 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: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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Beschreibung"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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 "Kurze Beschreibung von der Klasse"
 
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Festplatten"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr "Partitionen in dieser Klasse"
 
@@ -403,91 +410,91 @@ msgstr "Zum entfernen vormerken"
 msgid "Edit configuration"
 msgstr "Konfiguration bearbeiten"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Unbekannte Pakete"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "FAI-Paketliste"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "FAI Paket"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Debian-Version betreffend"
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Installations-Methode"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr "FÃ¼r diese Paketliste zu verwendende Installationsmethode"
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Pakete"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr "Pakete in dieser Klasse"
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "verschlÃ¼sselt"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "bewahren"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "FAI-Partitionstabellen-Eintrag"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "GerÃ¤t"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +502,53 @@ msgstr "GerÃ¤t"
 msgid "Name"
 msgstr "Name"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr "Festplattenname"
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Kurze Beschreibung"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "fstab-SchlÃ¼ssel"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Label"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Disk-Label"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Partitions-EintrÃ¤ge"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Kombinierte physikalische Partitionen"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +594,28 @@ msgstr "Skript"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr "Es gibt mehrere Dateien mit dem gleichen Pfad: %s"
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Vorlage"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "FAI-Vorlage"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr "Vorlagenklassenname"
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr "Vorlagendateien"
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr "Vorlagendateien in dieser Klasse"
 
@@ -879,7 +886,9 @@ msgstr "RAID-Arrays mÃ¼ssen mindestens zwei Partitionen enthalten!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "RAID 0 Arrays kÃ¶nnen nur in Kombination von zwei Partitionen realisiert werden!"
+msgstr ""
+"RAID 0 Arrays kÃ¶nnen nur in Kombination von zwei Partitionen realisiert "
+"werden!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/el_GR/fusiondirectory.po b/fai/locale/el_GR/fusiondirectory.po
index 580e68d39077c4ecba0c0e181a5009cdca207fd2..974f929ab97c4a4ab59b20573cce90f12a975839 100644
--- a/fai/locale/el_GR/fusiondirectory.po
+++ b/fai/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Maria Nomikou <mnomikou@sch.gr>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +67,7 @@ msgstr "Î ÏÎ¿Ï†Î¯Î» FAI ÎºÎ±Î¹ ÎÎºÎ´Î¿ÏƒÎ· Î³Î¹Î± Î½Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ Ïƒ
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ·"
 
@@ -84,7 +83,7 @@ msgstr "Î ÏÎ¿Ï†Î¯Î»"
 msgid "FAI profil to be applied to this computer"
 msgstr "Î ÏÎ¿Ï†Î¯Î» FAI Î³Î¹Î± Î½Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®"
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î¿"
 
@@ -113,7 +112,7 @@ msgid "Release used on this repository"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ· Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Î±Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î¿"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Î•Î½ÏŒÏ„Î·Ï„ÎµÏ‚"
 
@@ -178,12 +177,12 @@ msgstr "Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î±"
 msgid "Repositories this server hosts"
 msgstr "Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î± Ï€Î¿Ï… Ï†Î¹Î»Î¿Î¾ÎµÎ½ÎµÎ¯ Î±Ï…Ï„ÏŒÏ‚ Î¿ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
 
@@ -266,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr "Î•Ï†Î±ÏÎ¼Î¿Î³Î® Ï€ÏÎ¿Î²Î¿Î»Î®Ï‚ ÎºÎ±Ï„Î±Î³ÏÎ±Ï†ÏŽÎ½ FAI "
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
@@ -287,57 +286,57 @@ msgstr "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· RAID"
 msgid "Add LVM"
 msgstr "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Î Î¯Î½Î±ÎºÎ±Ï‚ ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÏ‰Î½"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 msgid "FAI partition table"
 msgstr "Î Î¯Î½Î±ÎºÎ±Ï‚ ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÏ‰Î½ FAI"
 
-#: 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Î”Î¯ÏƒÎºÎ¿Î¹"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr "ÎšÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÎ¹Ï‚ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎºÎ»Î¬ÏƒÎ·"
 
@@ -405,91 +404,91 @@ msgstr "Î£Î®Î¼Î±Î½ÏƒÎ· Î³Î¹Î± Î±Ï€ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·"
 msgid "Edit configuration"
 msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: admin/fai/class_faiPackageConfiguration.inc:59
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:41
 #: admin/fai/packageSelect/class_filterFAIPackages.inc:46
 msgid "Infrastructure service"
-msgstr "Î†Î³Î½Ï‰Ï„Î· Ï…Ï€Î¿Î´Î¿Î¼Î®"
+msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± Ï…Ï€Î¿Î´Î¿Î¼Î®Ï‚"
 
-#: admin/fai/class_faiPackage.inc:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î± Ï€Î±ÎºÎÏ„Î±"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Î Î±ÎºÎÏ„Î¿"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Î›Î¯ÏƒÏ„Î± Ï€Î±ÎºÎÏ„Ï‰Î½ FAI "
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "Î Î±ÎºÎÏ„Î¿ FAI"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ· Debian Ï€Î¿Ï… ÏƒÏ‡ÎµÏ„Î¯Î¶ÎµÏ„Î±Î¹"
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Î•Î½ÏŒÏ„Î·Ï„ÎµÏ‚ Ï€Î¿Ï… ÏƒÏ‡ÎµÏ„Î¯Î¶Î¿Î½Ï„Î±Î¹"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "ÎœÎÎ¸Î¿Î´Î¿Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr "Îœ'ÎµÎ¸Î¿Î´Î¿Ï‚ ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î· Î»Î¯ÏƒÏ„Î± Ï€Î±ÎºÎÏ„Ï‰Î½"
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Î Î±ÎºÎÏ„Î±"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr "Î Î±ÎºÎÏ„Î± ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎºÎ»Î¬ÏƒÎ·"
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "ÎµÎºÎºÎ¹Î½Î®ÏƒÎ¹Î¼Î¿"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "ÏÎµÎ¶ÎÏÎ²Î±"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "ÎšÎ±Ï„Î±Ï‡ÏŽÏÎ¹ÏƒÎ· Ï€Î¯Î½Î±ÎºÎ± ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÏ‰Î½"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "ÎšÎ±Ï„Î±Ï‡ÏŽÏÎ¹ÏƒÎ· Ï€Î¯Î½Î±ÎºÎ± ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÏ‰Î½ FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Î£Ï…ÏƒÎºÎµÏ…Î®"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -497,53 +496,53 @@ msgstr "Î£Ï…ÏƒÎºÎµÏ…Î®"
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "ÎºÎ»ÎµÎ¹Î´Î¯ fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Î•Ï„Î¹ÎºÎÏ„Î±"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Î•Ï„Î¹ÎºÎÏ„Î± Î´Î¯ÏƒÎºÎ¿Ï… "
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "ÎšÎ±Ï„Î±Ï‡Ï‰ÏÎ¯ÏƒÎµÎ¹Ï‚ ÎºÎ±Ï„Î¬Ï„Î¼Î·ÏƒÎ·Ï‚"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Î£Ï…Î½Î´Ï…Î±ÏƒÎ¼ÎÎ½ÎµÏ‚ Ï†Ï…ÏƒÎ¹ÎºÎÏ‚ ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÎ¹Ï‚"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -589,28 +588,28 @@ msgstr "Î”ÎÏƒÎ¼Î· ÎµÎ½ÎµÏÎ³ÎµÎ¹ÏŽÎ½"
 msgid "The script of this hook"
 msgstr "Î¤Î¿ ÏƒÎµÎ½Î¬ÏÎ¹Î¿ ÎµÎ½Ï„Î¿Î»ÏŽÎ½ Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ hook"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr "Î¥Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î±ÏÎºÎµÏ„Î¬ Î±ÏÏ‡ÎµÎ¯Î± Î¼Îµ Ï„Î·Î½ Î¯Î´Î¹Î± Î´Î¹Î±Î´ÏÎ¿Î¼Î® %s"
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Î ÏÏŒÏ„Ï…Ï€Î¿"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "Î ÏÏŒÏ„Ï…Ï€Î¿ FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr "ÎŒÎ½Î¿Î¼Î± ÎºÎ»Î¬ÏƒÎ·Ï‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…"
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr "Î‘ÏÏ‡ÎµÎ¯Î± Ï€ÏÎ¿Ï„ÏÏ€Ï‰Î½"
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr "Î‘ÏÏ‡ÎµÎ¯Î± Ï€ÏÎ¿Ï„ÏÏ€Ï‰Î½ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎºÎ»Î¬ÏƒÎ·"
 
@@ -876,7 +875,8 @@ msgstr "RAID 6"
 
 #: admin/fai/class_faiPartition.inc:478
 msgid "Raid arrays must contain at least two partitions!"
-msgstr "ÎŸÎ¹ ÏƒÏ…ÏƒÏ„Î¿Î¹Ï‡Î¯ÎµÏ‚ Raid Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Î´ÏÎ¿ ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÎ¹Ï‚!"
+msgstr ""
+"ÎŸÎ¹ ÏƒÏ…ÏƒÏ„Î¿Î¹Ï‡Î¯ÎµÏ‚ Raid Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡Î¿Ï…Î½ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Î´ÏÎ¿ ÎºÎ±Ï„Î±Ï„Î¼Î®ÏƒÎµÎ¹Ï‚!"
 
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
@@ -913,7 +913,9 @@ msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ ÎºÎ»Î¬Î´Î¿Î¹ FAI"
 
 #: admin/fai/class_faiManagement.inc:141
 msgid " Please add at least one repository service to create those."
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ, Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÏ„Îµ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Î¼Î¹Î± Ï…Ï€Î·ÏÎµÏƒÎ¯Î± Î±Ï€Î¿Î¸ÎµÏ„Î·ÏÎ¯Î¿Ï… Î³Î¹Î± Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÏ„Îµ"
+msgstr ""
+"Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ, Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÏ„Îµ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ Î¼Î¹Î± Ï…Ï€Î·ÏÎµÏƒÎ¯Î± Î±Ï€Î¿Î¸ÎµÏ„Î·ÏÎ¯Î¿Ï… Î³Î¹Î± Î½Î± "
+"Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÏ„Îµ"
 
 #: admin/fai/class_faiVariable.inc:28
 msgid "Variable"
@@ -957,7 +959,7 @@ msgstr "Î¤Î¿ ÏƒÎµÎ½Î¬ÏÎ¹Î¿ ÎµÎ½Ï„Î¿Î»ÏŽÎ½"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¹Ï‚ ÎµÏ€Î¹Î¸Ï…Î¼Î·Ï„Î»ÎµÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÎÏ‚"
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¹Ï‚ ÎµÏ€Î¹Î¸Ï…Î¼Î·Ï„ÎÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÎÏ‚"
 
 #: admin/fai/packageSelect/selectPackage-list.xml:48
 msgid "Version"
diff --git a/fai/locale/en/fusiondirectory.po b/fai/locale/en/fusiondirectory.po
index 3b5fde468b9202095c7b194afd50480263dd8bac..79a29386f9b999801c87b07802158129d3d145fb 100644
--- a/fai/locale/en/fusiondirectory.po
+++ b/fai/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -175,12 +175,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -263,7 +263,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr ""
 
@@ -284,57 +284,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -402,91 +402,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -494,52 +494,52 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -585,28 +585,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/es/fusiondirectory.po b/fai/locale/es/fusiondirectory.po
index 4ca7ef173d5a6bfa202d20e19a8afe80db23b4e8..dc3be8f6862223ef1b9efc82fbaca2d2f1972bf2 100644
--- a/fai/locale/es/fusiondirectory.po
+++ b/fai/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "VersiÃ³n"
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secciones"
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "DesconexiÃ³n por tiempo"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Error"
 
@@ -285,57 +286,57 @@ msgstr "AÃ±adir RAID"
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Propiedades"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nombre de clase"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "DescripciÃ³n"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Discos"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "MÃ©todo de instalaciÃ³n"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Paquetes"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr "Dispositivo"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "clave fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Etiqueta"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Etiqueta de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Entradas en la particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Particiones fÃsicas combinadas"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "Plantilla FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -879,7 +880,9 @@ msgstr "Â¡La matriz de discos RAID debe tener al menos dos particiones!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Â¡La matriz de discos RAID 0 solo puede ser creada con al menos una combinaciÃ³n de dos particiones!"
+msgstr ""
+"Â¡La matriz de discos RAID 0 solo puede ser creada con al menos una "
+"combinaciÃ³n de dos particiones!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/es_CO/fusiondirectory.po b/fai/locale/es_CO/fusiondirectory.po
index 306abe1f651f99e7d28913d1c5f6a29887100379..4375433da3cfc98d39a9ca0fdff585e20f87bd98 100644
--- a/fai/locale/es_CO/fusiondirectory.po
+++ b/fai/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Error"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Propiedades"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "DescripciÃ³n"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -628,7 +629,7 @@ msgstr ""
 
 #: admin/fai/class_faiPackageConfiguration.inc:172
 msgid "Warning"
-msgstr "Advertencia"
+msgstr "PrecacuiÃ³n"
 
 #: admin/fai/class_faiPackageConfiguration.inc:173
 #, php-format
diff --git a/fai/locale/es_VE/fusiondirectory.po b/fai/locale/es_VE/fusiondirectory.po
index daeeeaa874108ae7a22614b9f0b28e573b4d387c..c97561999f5e00981a34fc59f5a41f959de96c90 100644
--- a/fai/locale/es_VE/fusiondirectory.po
+++ b/fai/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "VersiÃ³n"
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secciones"
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "DesconexiÃ³n por tiempo"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Error"
 
@@ -285,57 +286,57 @@ msgstr "AÃ±adir RAID"
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Propiedades"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nombre de clase"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "DescripciÃ³n"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Discos"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquete"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Lista de paquetes FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "MÃ©todo de instalaciÃ³n"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Paquetes"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "inicializable"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Entrada en la tabla de particiones"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "Entrada en la tabla de particiones FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr "Dispositivo"
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "clave fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Etiqueta"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Etiqueta de disco"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Entradas en la particiÃ³n"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Particiones fÃsicas combinadas"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Plantilla"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "Plantilla FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -879,7 +880,9 @@ msgstr "Â¡La matriz de discos RAID debe tener al menos dos particiones!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Â¡La matriz de discos RAID 0 solo puede ser creada con al menos una combinaciÃ³n de dos particiones!"
+msgstr ""
+"Â¡La matriz de discos RAID 0 solo puede ser creada con al menos una "
+"combinaciÃ³n de dos particiones!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/fa_IR/fusiondirectory.po b/fai/locale/fa_IR/fusiondirectory.po
index 52d63567deb3802f24b21a8714ab4c17cf37625a..e17c811e41a4b278dc4f66b3153f15f7d8227c00 100644
--- a/fai/locale/fa_IR/fusiondirectory.po
+++ b/fai/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/fi_FI/fusiondirectory.po b/fai/locale/fi_FI/fusiondirectory.po
index 57b97dd202f6ebb91c62b47fecd4c9ab02927dd2..4f1bf1cb82b58234f9db2789966a9c492ae48a53 100644
--- a/fai/locale/fi_FI/fusiondirectory.po
+++ b/fai/locale/fi_FI/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Dina Solveig Jalkanen, 2016
-# Dina Solveig Jalkanen, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -84,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -113,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -178,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
@@ -266,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Virhe"
 
@@ -287,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Luokan nimi"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Kuvaus"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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 "Luokan lyhyt kuvaus"
 
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -405,91 +404,91 @@ msgstr "Merkitse poistettavaksi"
 msgid "Edit configuration"
 msgstr "Muokkaa asetuksia"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Asennustapa"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -497,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -583,34 +582,34 @@ msgstr ""
 #: admin/fai/class_faiHook.inc:85 admin/fai/class_faiScript.inc:30
 #: admin/fai/class_faiScript.inc:84
 msgid "Script"
-msgstr "skripti"
+msgstr "Skripti"
 
 #: admin/fai/class_faiHook.inc:85
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/fr/fusiondirectory.po b/fai/locale/fr/fusiondirectory.po
index 48a9b5eb27c06a7eb309380de63d347bb9154640..9887143a373371e26b017bbe485b93ae1911400b 100644
--- a/fai/locale/fr/fusiondirectory.po
+++ b/fai/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Version"
 
@@ -83,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "DÃ©pÃ´t"
 
@@ -112,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:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Sections"
 
@@ -127,7 +127,9 @@ msgstr "Type de miroir"
 #: admin/systems/services/repository/class_serviceRepository.inc:52
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Est ce que ce miroir est un dÃ©pÃ´t d'installation ? Est-ce que sa version de Debian est personnalisÃ©eâ€¯?"
+msgstr ""
+"Est ce que ce miroir est un dÃ©pÃ´t d'installation ? Est-ce que sa version de "
+"Debian est personnalisÃ©eâ€¯?"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Local mirror"
@@ -177,12 +179,12 @@ msgstr "DÃ©pÃ´ts"
 msgid "Repositories this server hosts"
 msgstr "DÃ©pÃ´ts fournis par ce serveur"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -201,7 +203,8 @@ msgstr "Port"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Le port sur lequel argonaut-fai-monitor doit Ã©couter. 4711 par dÃ©faut."
+msgstr ""
+"Le port sur lequel argonaut-fai-monitor doit Ã©couter. 4711 par dÃ©faut."
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
@@ -217,7 +220,9 @@ msgstr "Certificat CA"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
 msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "Chemin du fichier contenant le certificat du CA public sur le serveur oÃ¹ tourne argonaut-fai-monitor"
+msgstr ""
+"Chemin du fichier contenant le certificat du CA public sur le serveur oÃ¹ "
+"tourne argonaut-fai-monitor"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
 msgid "Log directory"
@@ -229,11 +234,11 @@ msgstr "RÃ©pertoire contenant les journaux systÃ¨mes de argonaut-fai-monitor"
 
 #: admin/systems/class_faiLogView.inc:57
 msgid "Sort down"
-msgstr "Tri dÃ©croissant"
+msgstr "Trier vers le bas"
 
 #: admin/systems/class_faiLogView.inc:59
 msgid "Sort up"
-msgstr "Tri croissant"
+msgstr "Trier vers le haut"
 
 #: admin/systems/class_faiLogView.inc:71
 msgid "File"
@@ -265,7 +270,7 @@ msgid "FAI Logs Viewer"
 msgstr "Afficheur de journaux systÃ¨mes FAI"
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Erreur"
 
@@ -286,57 +291,57 @@ msgstr "Ajouter du RAID"
 msgid "Add LVM"
 msgstr "Ajouter un LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Table des partitions"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nom de la classe"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 admin/fai/class_faiProfile.inc:52
 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: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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Description"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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 "Une courte description de cette classe"
 
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Disques"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr "Partitions dans cette classe"
 
@@ -378,7 +383,7 @@ msgstr "PropriÃ©taire du fichier"
 
 #: admin/fai/class_faiTemplateEntry.inc:171
 msgid "Group"
-msgstr "Groupe"
+msgstr "Groupes"
 
 #: admin/fai/class_faiTemplateEntry.inc:171
 msgid "File group"
@@ -404,91 +409,93 @@ msgstr "Marquer Ã  enlever"
 msgid "Edit configuration"
 msgstr "Ã‰diter la configuration"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Paquets inconnus"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paquet"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Liste de paquets FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "Paquet FAI"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "La version de Debian concernÃ©e"
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Les sections concernÃ©es"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "MÃ©thode d'installation"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 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:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Paquets"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr "Paquets dans cette classe"
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "chiffrÃ©"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "amorÃ§able"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "prÃ©server"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
-msgstr "Ce disque ne peut pas Ãªtre supprimÃ© car il est utilisÃ© par la dÃ©finition de disque \"%s\" !"
+msgstr ""
+"Ce disque ne peut pas Ãªtre supprimÃ© car il est utilisÃ© par la dÃ©finition de "
+"disque \"%s\" !"
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "EntrÃ©e de la table des partitions"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "EntrÃ©e de la table de partition FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "PÃ©riphÃ©rique"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -496,57 +503,60 @@ msgstr "PÃ©riphÃ©rique"
 msgid "Name"
 msgstr "Nom"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr "Nom du disque"
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Description courte"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "EntrÃ©e fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr "ClÃ© Ã  utiliser dans le fichier fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Ã‰tiquette"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Ã‰tiquette du disque"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Liste de partitions"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Partitions physiques combinÃ©es"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr "Combination des partitions physiques dans volume LVM"
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
-msgstr "Vous avez plus de quatre partitions primaires dans votre configuration."
+msgstr ""
+"Vous avez plus de quatre partitions primaires dans votre configuration."
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
-msgstr "Vous ne pouvez pas avoir plus de trois partitions primaires quand vous utilisez des partitions logiques."
+msgstr ""
+"Vous ne pouvez pas avoir plus de trois partitions primaires quand vous "
+"utilisez des partitions logiques."
 
 #: admin/fai/class_faiHook.inc:28
 msgid "Hook"
@@ -558,7 +568,7 @@ msgstr "Hook FAI"
 
 #: admin/fai/class_faiHook.inc:61
 msgid "Hooks"
-msgstr "Hooks"
+msgstr "Connexions"
 
 #: admin/fai/class_faiHook.inc:65 admin/fai/class_faiVariable.inc:65
 #: admin/fai/class_faiScript.inc:67
@@ -588,28 +598,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr "Le script de ce hook"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr "Il existe plusieurs fichiers avec le mÃªme cheminâ€¯: %s"
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "ModÃ¨le"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "ModÃ¨le FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr "Nom de la classe de modÃ¨le"
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr "Fichiers du modÃ¨le"
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr "Fichiers de modÃ¨le de cette classe"
 
@@ -638,7 +648,11 @@ msgid ""
 "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 "les questions debconf \"%s\" sont gÃ©nÃ©rÃ©e dynamiquement pendant l'installation du paquet et nÃ©cessite le choix entre diffÃ©rentes options qui ne peuvent pas Ãªtre affichÃ©es ici. Le texte entrÃ© doit Ãªtre un de ces choix pour Ãªtre valide."
+msgstr ""
+"les questions debconf \"%s\" sont gÃ©nÃ©rÃ©e dynamiquement pendant "
+"l'installation du paquet et nÃ©cessite le choix entre diffÃ©rentes options qui"
+" ne peuvent pas Ãªtre affichÃ©es ici. Le texte entrÃ© doit Ãªtre un de ces choix"
+" pour Ãªtre valide."
 
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
@@ -880,7 +894,8 @@ msgstr "Les ensembles RAID doivent contenir au moins 2 partitionsâ€¯!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Les ensembles RAID 0 ne peuvent Ãªtre rÃ©alisÃ©s qu'avec deux partitionsâ€¯!"
+msgstr ""
+"Les ensembles RAID 0 ne peuvent Ãªtre rÃ©alisÃ©s qu'avec deux partitionsâ€¯!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/hu_HU/fusiondirectory.po b/fai/locale/hu_HU/fusiondirectory.po
index 893e5e7275873d5feef630f3bcd173b9a1cac5e9..4c3d8d30c497ef10c7afe06fc07cfa500d0820b6 100644
--- a/fai/locale/hu_HU/fusiondirectory.po
+++ b/fai/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr ""
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "LeÃrÃ¡s"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/id/fusiondirectory.po b/fai/locale/id/fusiondirectory.po
index 5cd84b3bb0bb35ee61fc98d9abaff7eb083aba07..0f3cf18c7c81585a182ea5378fc9e6b516ea4bb2 100644
--- a/fai/locale/id/fusiondirectory.po
+++ b/fai/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +176,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr ""
 
@@ -285,57 +285,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +403,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +495,53 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +587,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/it_IT/fusiondirectory.po b/fai/locale/it_IT/fusiondirectory.po
index 7a2b890733ab990bd5b63e84a7a9a4e09412e053..7e357899b5a6ffbe94937ce77fe8378ba3f32197 100644
--- a/fai/locale/it_IT/fusiondirectory.po
+++ b/fai/locale/it_IT/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Versione"
 
@@ -83,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Deposito"
 
@@ -112,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:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Sezioni"
 
@@ -127,7 +127,9 @@ msgstr "Modo Mirror"
 #: admin/systems/services/repository/class_serviceRepository.inc:52
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Questo Mirror Ã¨ un repository d'installazione? La sua Release Ã¨ personalizzata?"
+msgstr ""
+"Questo Mirror Ã¨ un repository d'installazione? La sua Release Ã¨ "
+"personalizzata?"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Local mirror"
@@ -177,12 +179,12 @@ msgstr "Repositories"
 msgid "Repositories this server hosts"
 msgstr "Repository che questo server ospita"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
@@ -201,7 +203,9 @@ msgstr "Porta"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:43
 msgid "The port argonaut-fai-monitor should listen on. Default is 4711."
-msgstr "Il port del monitor FAI di Argonaut dovrebbe essere in ascolto. l valore predefinito Ã¨ 4711 ."
+msgstr ""
+"Il port del monitor FAI di Argonaut dovrebbe essere in ascolto. l valore "
+"predefinito Ã¨ 4711 ."
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
@@ -217,7 +221,9 @@ msgstr "Certificato CA"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
 msgid "Path to the CA certificate file on Argonaut FAI monitor server"
-msgstr "Percorso del file contenente il certificato CA sul server monitor FAI di Argonaut"
+msgstr ""
+"Percorso del file contenente il certificato CA sul server monitor FAI di "
+"Argonaut"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:58
 msgid "Log directory"
@@ -265,7 +271,7 @@ msgid "FAI Logs Viewer"
 msgstr "Connessioni FAI"
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Errore"
 
@@ -286,57 +292,57 @@ msgstr "Aggiungi il RAID"
 msgid "Add LVM"
 msgstr "Aggiungi LVM"
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Tavola delle partizioni"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "ProprietÃ "
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nome della classe"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 admin/fai/class_faiProfile.inc:52
 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: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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Descrizione"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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 "Breve descrizione della classe"
 
-#: admin/fai/class_faiPartitionTable.inc:316
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Dischi"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr "Partizioni in questa classe"
 
@@ -404,91 +410,93 @@ msgstr "Marca per la rimozione"
 msgid "Edit configuration"
 msgstr "Modifica configurazione"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Pacchetti sconosciuti"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pacchetto"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Elenco dei pacchetti FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "Pacchetto FAI"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr "Versione Debian da installare"
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr "Sezioni interessate"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Metodo d'installazione"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr "Installa metodo da utilizzare per questa lista di pacchetti"
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr "Pacchetti in questa classe"
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "criptato"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "Avviabile"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "preserve"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
-msgstr "La partizione non puÃ² essere rimossa mentre Ã© in uso nella definizione del disco '%s' !"
+msgstr ""
+"La partizione non puÃ² essere rimossa mentre Ã© in uso nella definizione del "
+"disco '%s' !"
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Elenco della tavola delle partizioni"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "Elenco della tavola delle partizioni FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Dispositivi"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -496,57 +504,59 @@ msgstr "Dispositivi"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr "Nome del disco"
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr "Breve descrizione"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "Elenco fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr "Chiave da usare nel file fstab"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Etichetta"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Etichetta del disco"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Elenco delle partizioni"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Combinazione delle partizioni fisiche"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr "Partizioni fisiche combinate in questo volume LVM"
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr "Ci sono piÃ¹ di quattro partizioni primarie nella tua configurazione"
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
-msgstr "Non puoi avere piÃ¹ di 3 partizioni primarie quando usi delle partizioni logiche"
+msgstr ""
+"Non puoi avere piÃ¹ di 3 partizioni primarie quando usi delle partizioni "
+"logiche"
 
 #: admin/fai/class_faiHook.inc:28
 msgid "Hook"
@@ -588,28 +598,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr "Lo script di questo hook"
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr "Ci sono piÃ¹ chiavi con  l'impronta %s"
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Modello"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "Modello FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr "Nome di classe modello"
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr "Modelli di file"
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr "File modello di questa classe"
 
@@ -638,11 +648,16 @@ msgid ""
 "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 "Queste domande debconf \"%s\" vengono generate dinamicamente durante l'installazione del pacchetto e richiedono di scegliere tra le opzioni specifiche che non possono essere presentate qui. Al fine di avere effetto il testo inserito deve essere una delle scelte valide."
+msgstr ""
+"Queste domande debconf \"%s\" vengono generate dinamicamente durante "
+"l'installazione del pacchetto e richiedono di scegliere tra le opzioni "
+"specifiche che non possono essere presentate qui. Al fine di avere effetto "
+"il testo inserito deve essere una delle scelte valide."
 
 #: admin/fai/class_faiPartition.inc:30
 msgid "Type of sizing - fixed, dynamic or all remaining space"
-msgstr "Tipo di dimensionamento - fisso , dinamico o tutto lo spazio rimanente"
+msgstr ""
+"Tipo di dimensionamento - fisso , dinamico o tutto lo spazio rimanente"
 
 #: admin/fai/class_faiPartition.inc:33
 msgid "Fixed"
diff --git a/fai/locale/lv/fusiondirectory.po b/fai/locale/lv/fusiondirectory.po
index 4024e8eae29d52ad81f97258372a3fa8f2c9388e..eb1e3c53f46ae7a95dfa80e1dfed975464c6cf81 100644
--- a/fai/locale/lv/fusiondirectory.po
+++ b/fai/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "KrÄtuve "
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP kÄ¼Å«da"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Apraksts"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/nb/fusiondirectory.po b/fai/locale/nb/fusiondirectory.po
index 369151894d62866bf4aee019e7e8662f364d2e36..a4b8abe6f4f0777510a9d18fb1cbc913dacfc7f5 100644
--- a/fai/locale/nb/fusiondirectory.po
+++ b/fai/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Feil"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Beskrivelse"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/nl/fusiondirectory.po b/fai/locale/nl/fusiondirectory.po
index 29fc90b7f6a4b7fccb26468cd03b179b0f22f41b..ff2663ec28553acde778664f044fd162e2f81e06 100644
--- a/fai/locale/nl/fusiondirectory.po
+++ b/fai/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:28
 msgid "FAI configuration"
-msgstr ""
+msgstr "FAI configuratie"
 
 #: config/fai/class_faiConfig.inc:29
 msgid "FusionDirectory fai plugin configuration"
-msgstr ""
+msgstr "FusionDirectory fai plugin configuratie"
 
 #: config/fai/class_faiConfig.inc:41 admin/systems/class_faiStartup.inc:64
 #: admin/fai/class_faiManagement.inc:117 admin/fai/class_faiManagement.inc:122
@@ -50,7 +51,7 @@ msgstr ""
 
 #: config/fai/class_faiConfig.inc:60
 msgid "s"
-msgstr ""
+msgstr "s"
 
 #: admin/systems/class_faiStartup.inc:65
 msgid "Full automated installation"
@@ -66,7 +67,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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Distributie versie"
 
@@ -82,7 +83,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Verzamelplaats"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Secties"
 
@@ -126,7 +127,8 @@ msgstr "Mirror mode"
 #: admin/systems/services/repository/class_serviceRepository.inc:52
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "In deze mirror een installatie repository ? Is zijn uitgave aangepast ?"
+msgstr ""
+"In deze mirror een installatie repository ? Is zijn uitgave aangepast ?"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Local mirror"
@@ -146,7 +148,7 @@ msgstr "Processor architecturen beschikbaar op deze repository "
 
 #: admin/systems/services/repository/class_serviceRepository.inc:72
 msgid "Distribution"
-msgstr ""
+msgstr "Distributie"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:72
 msgid "Which distribution is this repository for"
@@ -176,12 +178,12 @@ msgstr "Repositories"
 msgid "Repositories this server hosts"
 msgstr "Repositories op deze server"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -204,7 +206,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "Timeout"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -212,7 +214,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
 msgid "CA certificate"
-msgstr ""
+msgstr "CA certificaat"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:53
 msgid "Path to the CA certificate file on Argonaut FAI monitor server"
@@ -264,18 +266,18 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Fout"
 
 #: admin/systems/class_faiLogView.inc:219
 msgid "Selected file"
-msgstr ""
+msgstr "Geselecteerd bestand"
 
 #: admin/systems/class_faiLogView.inc:227
 #, php-format
 msgid "Selected file: %s"
-msgstr ""
+msgstr "Geselecteerd bestand: %s"
 
 #: admin/fai/class_faiPartitionTable.inc:111
 msgid "Add RAID"
@@ -285,57 +287,57 @@ msgstr "Raid toevoegen"
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Partitietabel"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Klassenaam"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Omschrijving"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Schijven"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -361,7 +363,7 @@ msgstr ""
 
 #: admin/fai/class_faiTemplateEntry.inc:159
 msgid "Content of the template file"
-msgstr ""
+msgstr "Inhoud van de template"
 
 #: admin/fai/class_faiTemplateEntry.inc:163
 msgid "Owner and group of the file"
@@ -393,7 +395,7 @@ msgstr ""
 
 #: admin/fai/class_faiPackage.inc:163
 msgid "Mark for installation"
-msgstr ""
+msgstr "Mask voor installatie"
 
 #: admin/fai/class_faiPackage.inc:167
 msgid "Mark for removal"
@@ -401,93 +403,93 @@ msgstr ""
 
 #: admin/fai/class_faiPackage.inc:172
 msgid "Edit configuration"
-msgstr ""
+msgstr "Bewerk de configuratie"
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Onbekende pakketen"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pakket"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "FAI pakket lijst"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "FAI pakket"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Installatie methode"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Pakketten"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "ge-encrypteerd"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootable"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "behouden"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "FAI partitie table invoer"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Apparaat"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +497,53 @@ msgstr "Apparaat"
 msgid "Name"
 msgstr "Naam"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "fstab key"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Label"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Disk label"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Partitie regels"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Gecombineerd fysieke partities"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -567,7 +569,7 @@ msgstr ""
 #: 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 ""
+msgstr "De naam van de variabele"
 
 #: admin/fai/class_faiHook.inc:73 admin/fai/class_faiVariable.inc:73
 #: admin/fai/class_faiScript.inc:75
@@ -587,28 +589,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Sjabloon"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "FAI sjabloon"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -645,11 +647,11 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:33
 msgid "Fixed"
-msgstr ""
+msgstr "Vast"
 
 #: admin/fai/class_faiPartition.inc:33
 msgid "Dynamic"
-msgstr ""
+msgstr "Dynamisch"
 
 #: admin/fai/class_faiPartition.inc:33
 msgid "Remaining space"
@@ -714,7 +716,7 @@ msgstr "Logische"
 
 #: admin/fai/class_faiPartition.inc:240
 msgid "Partition name"
-msgstr ""
+msgstr "Partitienaam"
 
 #: admin/fai/class_faiPartition.inc:250
 msgid "Size"
@@ -762,7 +764,7 @@ msgstr "Bewaar"
 
 #: admin/fai/class_faiPartition.inc:303
 msgid "Never"
-msgstr ""
+msgstr "Nooit"
 
 #: admin/fai/class_faiPartition.inc:303
 msgid "Always"
@@ -810,7 +812,7 @@ msgstr "btrfs"
 
 #: admin/fai/class_faiPartition.inc:314
 msgid "LVM/RAID"
-msgstr ""
+msgstr "LVM/RAID"
 
 #: admin/fai/class_faiPartition.inc:317
 msgid "Encrypted"
@@ -879,7 +881,9 @@ msgstr "RAID-arrays moet ten minste twee partities bevatten!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Raid 0 arrays kunnen alleen worden gerealiseerd in combinatie van twee partities!"
+msgstr ""
+"Raid 0 arrays kunnen alleen worden gerealiseerd in combinatie van twee "
+"partities!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/pl/fusiondirectory.po b/fai/locale/pl/fusiondirectory.po
index 3c7c86819a3f033b8a3f986efdee5adff08d5e4e..e0ac0d818b528b61d7e263bbe89648e242b4dede 100644
--- a/fai/locale/pl/fusiondirectory.po
+++ b/fai/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Wersja"
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "Repozytorium"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "Timeout"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Tablica partycji"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nazwa klasy"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Opis"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Dyski"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pakiet"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Lista pakietÃ³w FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Metoda instalacji"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Pakiety"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr "UrzÄ…dzenie"
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Partycje"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr "Skrypt"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Szablon"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "Szablon FAI"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/pt/fusiondirectory.po b/fai/locale/pt/fusiondirectory.po
index 22d2918d6516515dbabbb213bb429497310461c2..dad2176ded2c6c92567a6887d07c042b6b1a277f 100644
--- a/fai/locale/pt/fusiondirectory.po
+++ b/fai/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Erro"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Propriedades"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "DescriÃ§Ã£o"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Modelo"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/pt_BR/fusiondirectory.po b/fai/locale/pt_BR/fusiondirectory.po
index 7c1ae9a8129824620838b7307adfaad8493923cd..423c44dc16cd43917e9ef9a2124704bd781df431 100644
--- a/fai/locale/pt_BR/fusiondirectory.po
+++ b/fai/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "LiberaÃ§Ã£o"
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "RepositÃ³rio"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "Tempo limite"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Erro"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Tabela de partiÃ§Ã£o"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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:398
-#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:171
+#: admin/fai/class_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Propriedades"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Nome da classe"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "DescriÃ§Ã£o"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "Pacotes desconhecidos"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Pacote"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "Lista de pacotes FAI"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "Pacote FAI"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Pacotes"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "Encriptado"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "BootÃ¡vel"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "preservar"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Entrada na tabela de partiÃ§Ã£o"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "Entrada na tabela de partiÃ§Ã£o FAI"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Dispositivo"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr "Dispositivo"
 msgid "Name"
 msgstr "Nome"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "RÃ³tulo"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Modelo"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/ru/fusiondirectory.po b/fai/locale/ru/fusiondirectory.po
index 3b62133f44650082f26fea8c9246a83b8fa177da..a175017f5946043c0278c4f3c3b7b9a8664a8586 100644
--- a/fai/locale/ru/fusiondirectory.po
+++ b/fai/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "ÐžÐ±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -726,7 +727,7 @@ msgstr ""
 
 #: admin/fai/class_faiPartition.inc:256
 msgid "Flags"
-msgstr "Ð¤Ð»Ð°Ð³Ð¸"
+msgstr "Flags"
 
 #: admin/fai/class_faiPartition.inc:265
 msgid "Combined physical partitions in this RAID"
diff --git a/fai/locale/ru@petr1708/fusiondirectory.po b/fai/locale/ru@petr1708/fusiondirectory.po
index 879742adaa189430711782e492ed006ed680229f..d67db4cea866eb950f5ba476d36631f6ab9607cc 100644
--- a/fai/locale/ru@petr1708/fusiondirectory.po
+++ b/fai/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +176,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr ""
 
@@ -285,57 +285,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +403,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +495,53 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +587,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/sv/fusiondirectory.po b/fai/locale/sv/fusiondirectory.po
index 945c884e58f2417ac1a01ff351e0673e4d6251f9..1c1006748703b9236be932c74d6732ef9e60d121 100644
--- a/fai/locale/sv/fusiondirectory.po
+++ b/fai/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "Release"
 
@@ -82,7 +83,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "FÃ¶rrÃ¥d"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr "Sektioner"
 
@@ -126,7 +127,8 @@ msgstr "Mirror-lÃ¤ge"
 #: admin/systems/services/repository/class_serviceRepository.inc:52
 msgid ""
 "Is this mirror an installation repository? Is its release a custom one?"
-msgstr "Ã„r denna mirror ett installationsfÃ¶rrÃ¥d? Ã„r denna release skrÃ¤ddarsydd?"
+msgstr ""
+"Ã„r denna mirror ett installationsfÃ¶rrÃ¥d? Ã„r denna release skrÃ¤ddarsydd?"
 
 #: admin/systems/services/repository/class_serviceRepository.inc:57
 msgid "Local mirror"
@@ -176,12 +178,12 @@ msgstr "FÃ¶rrÃ¥d"
 msgid "Repositories this server hosts"
 msgstr "FÃ¶rrÃ¥d denna server tillhandahÃ¥ller"
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
@@ -264,7 +266,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Fel"
 
@@ -285,57 +287,57 @@ msgstr "LÃ¤gg till RAID"
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "Partitionstabell"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 msgid "FAI partition table"
 msgstr "FAI-partitionstabell"
 
-#: 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 admin/fai/class_faiProfile.inc:52
 #: admin/fai/class_faiVariable.inc:51 admin/fai/class_faiScript.inc:53
 msgid "Class name"
 msgstr "Klassnamn"
 
-#: admin/fai/class_faiPartitionTable.inc:306 admin/fai/class_faiProfile.inc:52
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "Beskrivning"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Diskar"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +405,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr "OkÃ¤nda paket"
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr "FAI-paketlista"
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr "FAI-paket"
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "Installationsmetod"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "Paket"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr "krypterad"
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr "bootbar"
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr "bevara"
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr "Partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr "FAI-partitionstabellspost"
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "Enhet"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +497,53 @@ msgstr "Enhet"
 msgid "Name"
 msgstr "Namn"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr "fstab-nyckel"
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr "Etikett"
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr "UUID"
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr "Disketikett"
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "Partitionsposter"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr "Kombinerade fysiska partitioner"
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +589,28 @@ msgstr "Script"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Mall"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr "FAI-mall"
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
@@ -879,7 +881,8 @@ msgstr "Raid-arrayer mÃ¥ste innehÃ¥lla minst tvÃ¥ partitioner!"
 #: admin/fai/class_faiPartition.inc:480
 msgid ""
 "Raid 0 arrays can only be realized with a combination of two partitions!"
-msgstr "Raid 0-arrayer kan bara fungera med en kombination av tvÃ¥ partitioner!"
+msgstr ""
+"Raid 0-arrayer kan bara fungera med en kombination av tvÃ¥ partitioner!"
 
 #: admin/fai/class_faiProfile.inc:30
 msgid "Profile"
diff --git a/fai/locale/ug/fusiondirectory.po b/fai/locale/ug/fusiondirectory.po
index 68c823c3cedacbe7060e0bf2ce21b51b60e432f9..ba079f1022a4491d5541aaf51f14f624c50c8ae5 100644
--- a/fai/locale/ug/fusiondirectory.po
+++ b/fai/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +66,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,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:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +176,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr ""
 
@@ -264,7 +264,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr ""
 
@@ -285,57 +285,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +403,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +495,53 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +587,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/vi_VN/fusiondirectory.po b/fai/locale/vi_VN/fusiondirectory.po
index 76938d9a6d348adac1c0f12b2a0dd47399d4316c..c22052766401c261eaceac48dab9cb572009f63d 100644
--- a/fai/locale/vi_VN/fusiondirectory.po
+++ b/fai/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: admin/fai/class_faiProfile.inc:49 admin/fai/class_faiVariable.inc:48
 #: admin/fai/class_faiScript.inc:50
 msgid "Properties"
 msgstr "Properties"
 
-#: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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 "MÃ´ táº£"
 
-#: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr ""
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr ""
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "Máº«u"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/fai/locale/zh/fusiondirectory.po b/fai/locale/zh/fusiondirectory.po
index aecf4a4d5cd7a13ca6796dc25045e04de717316a..9e9e0344a4f69e34645458fdcb93a38da8012ff9 100644
--- a/fai/locale/zh/fusiondirectory.po
+++ b/fai/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: admin/systems/class_faiStartup.inc:91
 #: admin/systems/services/repository/class_serviceRepository.inc:40
-#: admin/fai/class_faiPackage.inc:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Release"
 msgstr "å‘è¡Œ"
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "FAI profil to be applied to this computer"
 msgstr ""
 
-#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:411
+#: admin/systems/class_faiStartup.inc:103 admin/fai/class_faiPackage.inc:409
 msgid "Repository"
 msgstr "ä»“åº“"
 
@@ -111,7 +112,7 @@ msgid "Release used on this repository"
 msgstr ""
 
 #: admin/systems/services/repository/class_serviceRepository.inc:47
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections"
 msgstr ""
 
@@ -176,12 +177,12 @@ msgstr ""
 msgid "Repositories this server hosts"
 msgstr ""
 
-#: admin/systems/services/repository/class_serviceRepository.inc:236
-#: admin/systems/services/repository/class_serviceRepository.inc:253
+#: admin/systems/services/repository/class_serviceRepository.inc:240
 #: 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
+#: admin/systems/services/repository/class_serviceRepository.inc:261
+#: admin/fai/class_faiPartitionTable.inc:215
+#: admin/fai/class_faiPartitionTable.inc:256
+#: admin/fai/class_faiPackage.inc:251 admin/fai/class_faiTemplate.inc:109
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
@@ -204,7 +205,7 @@ msgstr ""
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "Timeout"
-msgstr ""
+msgstr "è¿‡æœŸ"
 
 #: admin/systems/services/monitor/class_argonautFAIMonitor.inc:48
 msgid "The timeout for bad clients. 0 to disable."
@@ -264,7 +265,7 @@ msgid "FAI Logs Viewer"
 msgstr ""
 
 #: admin/systems/class_faiLogView.inc:204
-#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:147
+#: admin/systems/class_faiLogView.inc:239 admin/fai/class_faiDiskEntry.inc:145
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -285,57 +286,57 @@ msgstr ""
 msgid "Add LVM"
 msgstr ""
 
-#: admin/fai/class_faiPartitionTable.inc:283
+#: admin/fai/class_faiPartitionTable.inc:289
 msgid "Partition table"
 msgstr "åˆ†åŒºè¡¨"
 
-#: admin/fai/class_faiPartitionTable.inc:284
-#: admin/fai/class_faiPartitionTable.inc:287
+#: admin/fai/class_faiPartitionTable.inc:290
+#: admin/fai/class_faiPartitionTable.inc:293
 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_faiPartitionTable.inc:309
+#: admin/fai/class_faiTemplateEntry.inc:139 admin/fai/class_faiPackage.inc:396
+#: admin/fai/class_faiHook.inc:48 admin/fai/class_faiTemplate.inc:166
 #: 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_faiPartitionTable.inc:312
+#: admin/fai/class_faiPackage.inc:399 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiTemplate.inc:169 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
+#: admin/fai/class_faiPartitionTable.inc:312 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiTemplateEntry.inc:146 admin/fai/class_faiPackage.inc:403
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiHook.inc:73 admin/fai/class_faiTemplate.inc:173
 #: 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_faiPartitionTable.inc:316
+#: admin/fai/class_faiPackage.inc:403 admin/fai/class_faiHook.inc:55
+#: admin/fai/class_faiTemplate.inc:173 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
+#: admin/fai/class_faiPartitionTable.inc:322
 msgid "Discs"
 msgstr "Discs"
 
-#: admin/fai/class_faiPartitionTable.inc:323
-#: admin/fai/class_faiDiskEntry.inc:271
+#: admin/fai/class_faiPartitionTable.inc:329
+#: admin/fai/class_faiDiskEntry.inc:269
 msgid "Partitions in this class"
 msgstr ""
 
@@ -403,91 +404,91 @@ msgstr ""
 msgid "Edit configuration"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:289
+#: admin/fai/class_faiPackage.inc:287
 #: 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:308
+#: admin/fai/class_faiPackage.inc:306
 msgid "Unkown packages"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:378
+#: admin/fai/class_faiPackage.inc:376
 #: admin/fai/packageSelect/selectPackage-list.xml:15
 msgid "Package"
 msgstr "è½¯ä»¶åŒ…"
 
-#: admin/fai/class_faiPackage.inc:379
+#: admin/fai/class_faiPackage.inc:377
 msgid "FAI Package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:382
+#: admin/fai/class_faiPackage.inc:380
 msgid "FAI Package"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:401 admin/fai/class_faiHook.inc:51
+#: admin/fai/class_faiPackage.inc:399 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:414
+#: admin/fai/class_faiPackage.inc:412
 msgid "Debian release concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:418
+#: admin/fai/class_faiPackage.inc:416
 msgid "Sections concerned"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method"
 msgstr "å®‰è£…æ–¹æ³•"
 
-#: admin/fai/class_faiPackage.inc:422
+#: admin/fai/class_faiPackage.inc:420
 msgid "Install method to use for this package list"
 msgstr ""
 
-#: admin/fai/class_faiPackage.inc:433
+#: admin/fai/class_faiPackage.inc:431
 msgid "Packages"
 msgstr "è½¯ä»¶åŒ…"
 
-#: admin/fai/class_faiPackage.inc:437
+#: admin/fai/class_faiPackage.inc:435
 msgid "Packages in this class"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:103
+#: admin/fai/class_faiDiskEntry.inc:101
 msgid "encrypted"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:106
+#: admin/fai/class_faiDiskEntry.inc:104
 msgid "bootable"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:109
+#: admin/fai/class_faiDiskEntry.inc:107
 msgid "preserve"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:148
+#: admin/fai/class_faiDiskEntry.inc:146
 #, php-format
 msgid ""
 "The partition cannot be deleted while it is used in the \"%s\" disk "
 "definition!"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:220
+#: admin/fai/class_faiDiskEntry.inc:218
 msgid "Partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:221
+#: admin/fai/class_faiDiskEntry.inc:219
 msgid "FAI partition table entry"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:232 admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:230 admin/fai/class_faiDiskEntry.inc:246
 msgid "Device"
 msgstr "è®¾å¤‡"
 
-#: admin/fai/class_faiDiskEntry.inc:235 admin/fai/class_faiHook.inc:69
+#: admin/fai/class_faiDiskEntry.inc:233 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
@@ -495,53 +496,53 @@ msgstr "è®¾å¤‡"
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/fai/class_faiDiskEntry.inc:235
+#: admin/fai/class_faiDiskEntry.inc:233
 msgid "Disk name"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:241 admin/fai/class_faiPartition.inc:246
+#: admin/fai/class_faiDiskEntry.inc:239 admin/fai/class_faiPartition.inc:246
 msgid "Short description"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "fstab key"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:245
+#: admin/fai/class_faiDiskEntry.inc:243
 msgid "Key to use in fstab file"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "Label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:248
+#: admin/fai/class_faiDiskEntry.inc:246
 msgid "UUID"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:251
+#: admin/fai/class_faiDiskEntry.inc:249
 msgid "Disk label"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:260
+#: admin/fai/class_faiDiskEntry.inc:258
 msgid "Partition entries"
 msgstr "åˆ†åŒºæ¡ç›®"
 
-#: admin/fai/class_faiDiskEntry.inc:265 admin/fai/class_faiPartition.inc:422
+#: admin/fai/class_faiDiskEntry.inc:263 admin/fai/class_faiPartition.inc:422
 msgid "Combined physical partitions"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:265
+#: admin/fai/class_faiDiskEntry.inc:263
 msgid "Physical partitions combined in this LVM volume"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:540
+#: admin/fai/class_faiDiskEntry.inc:538
 msgid ""
 "You have more than four primary partition table entries in your "
 "configuration"
 msgstr ""
 
-#: admin/fai/class_faiDiskEntry.inc:544
+#: admin/fai/class_faiDiskEntry.inc:542
 msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions"
@@ -587,28 +588,28 @@ msgstr "è„šæœ¬"
 msgid "The script of this hook"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:136
+#: admin/fai/class_faiTemplate.inc:131
 #, php-format
 msgid "There are several files with the same path: %s"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:151
+#: admin/fai/class_faiTemplate.inc:146
 msgid "Template"
 msgstr "æ¨¡æ¿"
 
-#: admin/fai/class_faiTemplate.inc:152 admin/fai/class_faiTemplate.inc:155
+#: admin/fai/class_faiTemplate.inc:147 admin/fai/class_faiTemplate.inc:150
 msgid "FAI template"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:174
+#: admin/fai/class_faiTemplate.inc:169
 msgid "Template class name"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:184
+#: admin/fai/class_faiTemplate.inc:179
 msgid "Template files"
 msgstr ""
 
-#: admin/fai/class_faiTemplate.inc:188
+#: admin/fai/class_faiTemplate.inc:183
 msgid "Template files in this class"
 msgstr ""
 
diff --git a/freeradius/admin/freeradius/class_freeradiusGroup.inc b/freeradius/admin/freeradius/class_freeradiusGroup.inc
index fc1d9fc7b64ba42bd5a1bc0ef58374d8dd2825ba..0fe2d7b588d21677b27a7449735b2e3d3a1f79a1 100644
--- a/freeradius/admin/freeradius/class_freeradiusGroup.inc
+++ b/freeradius/admin/freeradius/class_freeradiusGroup.inc
@@ -44,6 +44,7 @@ class freeradiusGroup extends simplePlugin {
   static function getAttributesInfo ()
   {
     return array(
+    // Attributes are grouped by section
     'section1' => array(
         'name'  => _('Support 802.1x'),
         'attrs' => array(
diff --git a/freeradius/locale/ar/fusiondirectory.po b/freeradius/locale/ar/fusiondirectory.po
index 219375942465656292372635d00d7f68ac955aac..5d0b251cb493ffa6890e0160abadd8f56d7326fd 100644
--- a/freeradius/locale/ar/fusiondirectory.po
+++ b/freeradius/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ca/fusiondirectory.po b/freeradius/locale/ca/fusiondirectory.po
index 01a1978924b51641b1e06b722e15ccb1a513ad61..4feaa0a34687a42279892358580a01eef781510b 100644
--- a/freeradius/locale/ca/fusiondirectory.po
+++ b/freeradius/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/cs_CZ/fusiondirectory.po b/freeradius/locale/cs_CZ/fusiondirectory.po
index f717d23e2c39f0a6fcd2094c60ce384609c2662a..efe34a0c5e17f7a1060c2cb14dd4af436e7bb7b2 100644
--- a/freeradius/locale/cs_CZ/fusiondirectory.po
+++ b/freeradius/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,96 +26,98 @@ msgstr "Freeradius"
 #: personal/freeradius/class_freeradiusAccount.inc:36
 #: admin/freeradius/class_freeradiusGroup.inc:35
 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"
+msgstr ""
+"Tento zÃ¡suvnÃ½ modul slouÅ¾Ã pro sprÃ¡vu ovÄ›Å™ovÃ¡nÃ Radius, zaloÅ¾enÃ©m na "
+"implementaci FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Podpora 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Typ mÃ©dia tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "NÃ¡zev typu mÃ©dia tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Typ tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "NÃ¡zev typu tunelu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "IdentifikÃ¡tor virtuÃ¡lnÃ sÃtÄ› (vlan)"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
-msgstr "IdentifikÃ¡tor virt. sÃtÄ› (vlan)"
+msgstr "identifikÃ¡tor VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
-msgstr "Datum skonÄenÃ platnosti"
+msgstr "Datum vyprÅ¡enÃ platnosti"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Datum skonÄenÃ platnosti ÃºÄtu"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
-msgstr "Skupiny"
+msgstr "skupiny"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "FreeRadius skupina"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "PÅ™edvolby uÅ¾ivatele"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protokol"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "IP adresa"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "Maska IP sÃtÄ›"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Komprese"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Typ sluÅ¾by"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "ÄŒasovÃ½ limit relace"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr "ÄŒasovÃ½ limit neÄinnosti"
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr "OmezenÃ portÅ¯"
diff --git a/freeradius/locale/de/fusiondirectory.po b/freeradius/locale/de/fusiondirectory.po
index 263d75bd06195eb5995d7380c769b037fa070b8b..240d7f0332399f201bec96777ee7545cf3452b68 100644
--- a/freeradius/locale/de/fusiondirectory.po
+++ b/freeradius/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,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:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "UnterstÃ¼tzung von 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Art des Tunnelmediums"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Name der Tunnelmediumart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tunelart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Name der Tunnelart"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "VLAN identifier"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Datum des Kontenablaufs"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Gruppen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "FreeRadius Gruppe"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "BenutzerprÃ¤ferenzen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "IP Addresse"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "IP Netmaske"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Kompression"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Dienst-Art"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "Session Timeout"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr "Idle Timeout"
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr "Port Limit"
diff --git a/freeradius/locale/el_GR/fusiondirectory.po b/freeradius/locale/el_GR/fusiondirectory.po
index 36753ea996f2afdead36ecf250b6d9f43c40d9ee..a5fe915dde94c3b0bbb666ec5e114d6d61021a60 100644
--- a/freeradius/locale/el_GR/fusiondirectory.po
+++ b/freeradius/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Î¥Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Î•Î¯Î´Î¿Ï‚ Î¼ÎÏƒÎ¿Ï… Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "ÎŒÎ½Î¿Î¼Î± Ï„Î¿Ï… ÎµÎ¯Î´Î¿Ï…Ï‚ Î¼ÎÏƒÎ¿Ï… Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ Tunnel "
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "ÎŒÎ½Î¿Î¼Î± Ï„Î¿Ï… tunnel type"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Î‘Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚ Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "ÎŸÎ¼Î¬Î´ÎµÏ‚"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "ÎŸÎ¼Î¬Î´Î± FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "Î ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÎ¹Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "ÎœÎ¬ÏƒÎºÎ± Î´Î¹ÎºÏ„ÏÎ¿Ï… "
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Î£Ï…Î¼Ï€Î¯ÎµÏƒÎ·"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "ÎŒÏÎ¹Î¿ Ï‡ÏÏŒÎ½Î¿Ï… ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr "Î§ÏÏŒÎ½Î¿Ï‚ Î±Î´ÏÎ¬Î½ÎµÎ¹Î±Ï‚"
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr "ÎŒÏÎ¹Î¿ Î¸ÏÏÎ±Ï‚"
diff --git a/freeradius/locale/en/fusiondirectory.po b/freeradius/locale/en/fusiondirectory.po
index 49a33b2df48737b78839af1ce5f88ea2824b4d61..c4df351c3220788891d42eb33ee6d624415196a0 100644
--- a/freeradius/locale/en/fusiondirectory.po
+++ b/freeradius/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es/fusiondirectory.po b/freeradius/locale/es/fusiondirectory.po
index 6d5b0c277d570bab6d47899b0c74744e8c04e908..8b9df7ea94744bf2f8f9e17b42ff639e682a695c 100644
--- a/freeradius/locale/es/fusiondirectory.po
+++ b/freeradius/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es_CO/fusiondirectory.po b/freeradius/locale/es_CO/fusiondirectory.po
index e16b655c03763ea3d594613242f8bad29cc80b9d..ad7c1e717df5840fb08e7933f4cca358c078b05b 100644
--- a/freeradius/locale/es_CO/fusiondirectory.po
+++ b/freeradius/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/es_VE/fusiondirectory.po b/freeradius/locale/es_VE/fusiondirectory.po
index 42d0be11c0f968f4d4985b5d90df4560d5a4af31..23dc24df7be8d7e32623ad944d22e7f36cf34ad0 100644
--- a/freeradius/locale/es_VE/fusiondirectory.po
+++ b/freeradius/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fa_IR/fusiondirectory.po b/freeradius/locale/fa_IR/fusiondirectory.po
index 421a2246f6ad3b26943bf9046eb91d269d016877..9481eeb9c703ec355bfae9e2e78107e19e7fb6cc 100644
--- a/freeradius/locale/fa_IR/fusiondirectory.po
+++ b/freeradius/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fi_FI/fusiondirectory.po b/freeradius/locale/fi_FI/fusiondirectory.po
index 2930688847917c286646ae12fb1aa09cc4d066f8..27e700ad90d13d895b9739bef8dcc2c3483c96b3 100644
--- a/freeradius/locale/fi_FI/fusiondirectory.po
+++ b/freeradius/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "ErÃ¤pÃ¤ivÃ¤"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/fr/fusiondirectory.po b/freeradius/locale/fr/fusiondirectory.po
index f9afcee557b297a6b8d4eab0c8951a284802dc92..7675412432a24918f9b100468b976f85059b52f9 100644
--- a/freeradius/locale/fr/fusiondirectory.po
+++ b/freeradius/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,96 +26,96 @@ msgstr "Freeradius"
 #: personal/freeradius/class_freeradiusAccount.inc:36
 #: admin/freeradius/class_freeradiusGroup.inc:35
 msgid "This Plugin is for Radius accounting based in FreeRadius"
-msgstr "Ce plugin est pour la comptabilitÃ© Radius basÃ© sur FreeRadius"
+msgstr "Cette extension est pour la comptabilitÃ© Radius basÃ© sur FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Supporter 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Type de mÃ©dia pour le tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Nom du type de mÃ©dia pour le tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Type de tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nom du type de tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
-msgstr "ID du Vlan"
+msgstr "id du Vlan"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Identifiant du Vlan"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Date d'expiration du compte"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Groupes"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "Groupe Freeradius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "PrÃ©fÃ©rences utilisateurs"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protocole"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "Masque de rÃ©seau"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Compression"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Type de service"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "DÃ©lai d'inactivitÃ©"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
-msgstr "DÃ©lai d'inactivitÃ© sans trafic"
+msgstr "DÃ©lai d'inactivitÃ© sans traffic"
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr "Limite du port"
diff --git a/freeradius/locale/hu_HU/fusiondirectory.po b/freeradius/locale/hu_HU/fusiondirectory.po
index 41e2fb50428069a90a0ff2d7e00299a3f2bd2098..77f920b887540041f0a6e1e0fdd9043cbdfda540 100644
--- a/freeradius/locale/hu_HU/fusiondirectory.po
+++ b/freeradius/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/id/fusiondirectory.po b/freeradius/locale/id/fusiondirectory.po
index e0a7a85633ac3a249f7b901f9c2e21a2200398e5..cfc0ef4ae66525d94ad0150499b8e2a4f035a25b 100644
--- a/freeradius/locale/id/fusiondirectory.po
+++ b/freeradius/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/it_IT/fusiondirectory.po b/freeradius/locale/it_IT/fusiondirectory.po
index 9703a7090c642f26451c02236243758fcae1e09e..f9f915b1343d47c2a93b76abd2d86c9de0bd503b 100644
--- a/freeradius/locale/it_IT/fusiondirectory.po
+++ b/freeradius/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,94 +28,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:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "Supporto 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr "Tunnel di tipo medio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr "Nome del tunnel di tipo medio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tipo di tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nome del tipo di tunnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "ID della VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Identificatore della VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Data di scadenza dell'account"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Gruppi"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "Gruppo FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "Preferenze dell'utente"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "Maschera di rete"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr "Framed-MTU"
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Compressione"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Tipo di servizio"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "Scadenza della sessione"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr "Tempo d'inattivitÃ "
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr "limite porta"
diff --git a/freeradius/locale/lv/fusiondirectory.po b/freeradius/locale/lv/fusiondirectory.po
index 76709b47ef4a8d01f261dc2f48ce39e8d428a612..79e9591af55c0403cae04fd77dff19cef65d8cb3 100644
--- a/freeradius/locale/lv/fusiondirectory.po
+++ b/freeradius/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "DerÄ«guma termiÅ†Å¡"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/nb/fusiondirectory.po b/freeradius/locale/nb/fusiondirectory.po
index 9183860c6aad6c1620aa256dd07cca0425e7c5a9..7491b00f83088bce33954ef95d7feb7edbe168ff 100644
--- a/freeradius/locale/nb/fusiondirectory.po
+++ b/freeradius/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/nl/fusiondirectory.po b/freeradius/locale/nl/fusiondirectory.po
index 545f2cb18a8bbf7410e74002a42d725b6aff1b62..a2d9cd0a05437dc4055a7c6f497d107c8f7273b0 100644
--- a/freeradius/locale/nl/fusiondirectory.po
+++ b/freeradius/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,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:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
-msgstr ""
+msgstr "Support 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
-msgstr ""
+msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Groepen"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
-msgstr ""
+msgstr "Protocol"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
-msgstr ""
+msgstr "IP adres"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
-msgstr ""
+msgstr "Poort limiet"
diff --git a/freeradius/locale/pl/fusiondirectory.po b/freeradius/locale/pl/fusiondirectory.po
index 6dfffe56187ea18851b321be7f14d7032796482a..a1b08229c6407ae733283a80e349b2a6ac7d511e 100644
--- a/freeradius/locale/pl/fusiondirectory.po
+++ b/freeradius/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupy"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/pt/fusiondirectory.po b/freeradius/locale/pt/fusiondirectory.po
index 5ee9fe912e1488ee158e341945aa3b7612506b8d..04c5ac5f3ee01caae298f3871ce2bb20482ec579 100644
--- a/freeradius/locale/pt/fusiondirectory.po
+++ b/freeradius/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/pt_BR/fusiondirectory.po b/freeradius/locale/pt_BR/fusiondirectory.po
index 409b129c0df233ab2b9d009c6ea7652ef7c9e216..4fcbd63d73055c991c49d6f7e4c283081f62ef44 100644
--- a/freeradius/locale/pt_BR/fusiondirectory.po
+++ b/freeradius/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,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:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Tipo de tÃºnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "Nome do tipo de tÃºnel"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "id de VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Indentificador da VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr "Data de expiraÃ§Ã£o da conta"
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupos"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr "Grupo FreeRadius"
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr "PreferÃªncias de usuÃ¡rios"
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "EndereÃ§o IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "IP de mÃ¡scara de rede"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "CompressÃ£o"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr "Tipo de serviÃ§o"
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr "Tempo limite de sessÃ£o esgotado"
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ru/fusiondirectory.po b/freeradius/locale/ru/fusiondirectory.po
index 25167509d33c9c4aa3c27c913f1c2e6f8246d8a5..56b62e64bf094a0d02d60aefe6a072d87272ed09 100644
--- a/freeradius/locale/ru/fusiondirectory.po
+++ b/freeradius/locale/ru/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,94 +28,94 @@ msgstr "Freeradius"
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr "ÐŸÐ¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° 802.1x"
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr "Ð¢Ð¸Ð¿ Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ"
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ‚Ð¸Ð¿Ð° Ñ‚ÑƒÐ½Ð½ÐµÐ»Ñ"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr "VLAN id"
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ VLAN"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr "ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»"
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr "IP Ð°Ð´Ñ€ÐµÑ"
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr "ÑÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°ÑÐºÐ° IP"
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr "Ð¡Ð¶Ð°Ñ‚Ð¸Ðµ"
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ru@petr1708/fusiondirectory.po b/freeradius/locale/ru@petr1708/fusiondirectory.po
index c0a1a971a9ff330d0cc26882b35987639b20616d..de62cdfa753c7a9b1f8788383f348ac8a2cfec3f 100644
--- a/freeradius/locale/ru@petr1708/fusiondirectory.po
+++ b/freeradius/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/sv/fusiondirectory.po b/freeradius/locale/sv/fusiondirectory.po
index c7e87a5394e5f2fc86bda597bb3aaa0e74e5ef87..d5f27db810a4aa4422ce8f3e0cef66917915d645 100644
--- a/freeradius/locale/sv/fusiondirectory.po
+++ b/freeradius/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr "UtgÃ¥ngsdatum"
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "Grupper"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/ug/fusiondirectory.po b/freeradius/locale/ug/fusiondirectory.po
index 2deabe82bc6b8142b3295584b118dfbdbbb4dd58..47ff71f28b19327ee1a801b7300a980615e733df 100644
--- a/freeradius/locale/ug/fusiondirectory.po
+++ b/freeradius/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +27,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/vi_VN/fusiondirectory.po b/freeradius/locale/vi_VN/fusiondirectory.po
index 821047d40f13edc3c7d92c92948379d59008148e..c9a7ebed8d9c66ef531e852c434830ce446d749e 100644
--- a/freeradius/locale/vi_VN/fusiondirectory.po
+++ b/freeradius/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "CÃ¡c nhÃ³m"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/locale/zh/fusiondirectory.po b/freeradius/locale/zh/fusiondirectory.po
index b27a68a641b0202713c1b5e4d9d6de9f44e6e7d1..e1d85859fc0356490aa4b288a1778c58cb8752ed 100644
--- a/freeradius/locale/zh/fusiondirectory.po
+++ b/freeradius/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,94 +28,94 @@ msgstr ""
 msgid "This Plugin is for Radius accounting based in FreeRadius"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:54
-#: admin/freeradius/class_freeradiusGroup.inc:48
+#: personal/freeradius/class_freeradiusAccount.inc:55
+#: admin/freeradius/class_freeradiusGroup.inc:49
 msgid "Support 802.1x"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:51
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:52
 msgid "Tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:57
-#: admin/freeradius/class_freeradiusGroup.inc:52
+#: personal/freeradius/class_freeradiusAccount.inc:58
+#: admin/freeradius/class_freeradiusGroup.inc:53
 msgid "Name of the tunnel medium type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:58
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:59
 msgid "Tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:62
-#: admin/freeradius/class_freeradiusGroup.inc:59
+#: personal/freeradius/class_freeradiusAccount.inc:63
+#: admin/freeradius/class_freeradiusGroup.inc:60
 msgid "Name of the tunnel type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:65
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:66
 msgid "VLAN id"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:67
-#: admin/freeradius/class_freeradiusGroup.inc:66
+#: personal/freeradius/class_freeradiusAccount.inc:68
+#: admin/freeradius/class_freeradiusGroup.inc:67
 msgid "VLAN identifier"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Expiration date"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:72
+#: personal/freeradius/class_freeradiusAccount.inc:73
 msgid "Date of the expiration account"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:79
-#: personal/freeradius/class_freeradiusAccount.inc:83
+#: personal/freeradius/class_freeradiusAccount.inc:80
+#: personal/freeradius/class_freeradiusAccount.inc:84
 msgid "Groups"
 msgstr "ç”¨æˆ·ç»„"
 
-#: personal/freeradius/class_freeradiusAccount.inc:84
+#: personal/freeradius/class_freeradiusAccount.inc:85
 msgid "FreeRadius Group"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:93
+#: personal/freeradius/class_freeradiusAccount.inc:94
 msgid "User preferences"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:96
+#: personal/freeradius/class_freeradiusAccount.inc:97
 msgid "Protocol"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:101
+#: personal/freeradius/class_freeradiusAccount.inc:102
 msgid "IP Address"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:106
+#: personal/freeradius/class_freeradiusAccount.inc:107
 msgid "IP Netmask"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:111
+#: personal/freeradius/class_freeradiusAccount.inc:112
 msgid "Framed-MTU"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:118
+#: personal/freeradius/class_freeradiusAccount.inc:119
 msgid "Compression"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:123
+#: personal/freeradius/class_freeradiusAccount.inc:124
 msgid "Service type"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:128
+#: personal/freeradius/class_freeradiusAccount.inc:129
 msgid "Session Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:135
+#: personal/freeradius/class_freeradiusAccount.inc:136
 msgid "Idle Timeout"
 msgstr ""
 
-#: personal/freeradius/class_freeradiusAccount.inc:142
+#: personal/freeradius/class_freeradiusAccount.inc:143
 msgid "Port limit"
 msgstr ""
diff --git a/freeradius/personal/freeradius/class_freeradiusAccount.inc b/freeradius/personal/freeradius/class_freeradiusAccount.inc
index 45fb7fabea834f289f1fe5b9f6af965cde6788be..503c80309ffbe964a8c6b5a11300b7af609e6f36 100644
--- a/freeradius/personal/freeradius/class_freeradiusAccount.inc
+++ b/freeradius/personal/freeradius/class_freeradiusAccount.inc
@@ -50,6 +50,7 @@ class freeradiusAccount extends simplePlugin {
   static function getAttributesInfo ()
   {
     return array(
+    // Attributes are grouped by section
     'section1' => array(
         'name'  => _('Support 802.1x'),
         'attrs' => array(
diff --git a/fusioninventory/admin/inventory/class_inventoryManagement.inc b/fusioninventory/admin/inventory/class_inventoryManagement.inc
index 4c214f97523f2dceb38dce15458bec99dbc416c2..4c4db9880eeabbc8429c13a802283612ee66805d 100644
--- a/fusioninventory/admin/inventory/class_inventoryManagement.inc
+++ b/fusioninventory/admin/inventory/class_inventoryManagement.inc
@@ -65,7 +65,8 @@ class inventoryManagement extends simpleManagement
 
     global $config;
     $ldap = $config->get_ldap_link();
-    $ldap->ls('(objectClass=fdInventoryOPERATINGSYSTEM)', $dn, array('fdInventoryNAME','fdInventoryFQDN'));
+    $ldap->cd($dn);
+    $ldap->search('(objectClass=fdInventoryOPERATINGSYSTEM)', array('fdInventoryNAME','fdInventoryFQDN'), 'one');
     while ($attrs = $ldap->fetch()) {
       $link = $attrs['fdInventoryNAME'][0];
       if (isset($attrs['fdInventoryFQDN'][0])) {
diff --git a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
index da9ffb36ae753ceac0abca7ad2999b82c7b8da70..5138f8034ff3d4dbc606bce605da90d6139d7909 100644
--- a/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
+++ b/fusioninventory/admin/systems/fusioninventory/class_fiInventory.inc
@@ -23,6 +23,8 @@ class fiInventory extends simplePlugin
   var $objectclasses  = array();
   var $displayHeader  = FALSE;
 
+  protected $filter = '';
+
   static $sections = array (
     'antivirus'       => 'software',
     'batteries'       => 'hardware',
@@ -87,6 +89,15 @@ class fiInventory extends simplePlugin
   static function getAttributesInfo ()
   {
     return array(
+      'match' => array(
+        'name'      => _('Matching system'),
+        'class'     => array('fullwidth'),
+        'attrs'     => array(
+          new DisplayAttribute(_('System'), _('System entry matching this inventory'), 'matching'),
+          new HiddenArrayAttribute('macAddress'),
+          new HiddenArrayAttribute('ipHostNumber'),
+        ),
+      ),
       'hardware' => array(
         'name'      => _('Hardware'),
         'class'     => array('fullwidth'),
@@ -122,6 +133,9 @@ class fiInventory extends simplePlugin
       $this->mainTab        = TRUE;
       $this->objectclasses  = array('fdInventoryContent');
       $attributesInfo['hardware']['attrs'][] = new HiddenAttribute('cn');
+      $attributesInfo['match']['attrs'][0]->setAllowHTML(TRUE);
+    } else {
+      unset($attributesInfo['match']);
     }
 
     parent::__construct($dn, $object, $parent, $mainTab, $attributesInfo);
@@ -160,52 +174,64 @@ class fiInventory extends simplePlugin
 
     if ($this->mainTab) {
       $dn = $this->dn;
+      $macAddress   = $this->attrs['macAddress'];
+      $ipHostNumber = $this->attrs['ipHostNumber'];
+      unset($macAddress['count']);
+      unset($ipHostNumber['count']);
     } else {
       if (!isset($this->parent)) {
         return array();
       }
-      $matching     = $config->get_cfg_value('inventoryMatching', 'mac');
-      $macAddress   = $this->parent->getBaseObject()->netConfigDNS->macAddress;
-      $ipHostNumber = $this->parent->getBaseObject()->netConfigDNS->ipHostNumber;
+      $macAddress   = $this->parent->getBaseObject()->macAddress;
       if ($macAddress != '') {
-        $macfilter = "(macAddress=$macAddress)";
-      } else {
-        $macfilter = NULL;
-        if (($matching == 'mac') || ($matching == 'both')) {
-          return array();
-        }
+        $macAddress = array($macAddress);
       }
-      if (!empty($ipHostNumber)) {
-        $ipfilter = '(|(ipHostNumber='.implode(')(ipHostNumber=', $ipHostNumber).'))';
-      } else {
-        $ipfilter = NULL;
-        if (($matching == 'ip') || ($matching == 'both') || ($macfilter === NULL)) {
-          return array();
-        }
+      $ipHostNumber = $this->parent->getBaseObject()->ipHostNumber;
+    }
+    $matching     = $config->get_cfg_value('inventoryMatching', 'mac');
+    if (!empty($macAddress)) {
+      $macfilter = '(|(macAddress='.implode(')(macAddress=', $macAddress).'))';
+    } else {
+      $macfilter = NULL;
+      if (($matching == 'mac') || ($matching == 'both')) {
+        return array();
       }
-      switch ($matching) {
-        case 'ip':
-          $filter = $ipfilter;
-          break;
-        case 'mac':
-          $filter = $macfilter;
-          break;
-        case 'both':
-          $filter = "(&$macfilter$ipfilter)";
-          break;
-        case 'either':
-          $filter = "(|$macfilter$ipfilter)";
-          break;
+    }
+    if (!empty($ipHostNumber)) {
+      $ipfilter = '(|(ipHostNumber='.implode(')(ipHostNumber=', $ipHostNumber).'))';
+    } else {
+      $ipfilter = NULL;
+      if (($matching == 'ip') || ($matching == 'both') || ($macfilter === NULL)) {
+        return array();
       }
+    }
+    switch ($matching) {
+      case 'ip':
+        $this->filter = $ipfilter;
+        break;
+      case 'mac':
+        $this->filter = $macfilter;
+        break;
+      case 'both':
+        $this->filter = "(&$macfilter$ipfilter)";
+        break;
+      case 'either':
+        $this->filter = "(|$macfilter$ipfilter)";
+        break;
+    }
+    if ($this->mainTab) {
+      $this->updateMatching();
+    } else {
       $ldap->cd(get_ou('inventoryRDN').$config->current['BASE']);
-      $ldap->search('(&(objectClass=fdInventoryContent)'.$filter.')');
+      $ldap->search('(&(objectClass=fdInventoryContent)'.$this->filter.')');
       if ($attrs = $ldap->fetch()) {
         $dn = $attrs['dn'];
       } else {
         return array();
       }
     }
-    $ldap->ls('(objectClass=*)', $dn);
+    $ldap->cd($dn);
+    $ldap->search('(objectClass=*)', array('*'), 'one');
     $infos = array();
     while ($attrs = $ldap->fetch()) {
       $object = array();
@@ -251,5 +277,105 @@ class fiInventory extends simplePlugin
 
     return $infos;
   }
+
+  function updateMatching()
+  {
+    global $config;
+    $systemTypes = array('server','workstation','terminal','printer','component','phone','mobilePhone');
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search($this->filter);
+    $foundType  = FALSE;
+    $fallbackDn = NULL;
+    while (!$foundType && ($attrs = $ldap->fetch())) {
+      if ($attrs['dn'] == $this->dn) {
+        continue;
+      }
+      foreach ($systemTypes as $type) {
+        if (objects::isOfType($attrs, $type)) {
+          $foundType = $type;
+          break;
+        }
+      }
+      if ($foundType) {
+        $this->matching = objects::link($attrs['dn'], $foundType);
+      } else {
+        $fallbackDn = $attrs['dn'];
+      }
+    }
+    if ($foundType) {
+      return;
+    }
+    if ($fallbackDn !== NULL) {
+      $this->matching = $attrs['dn'];
+    } else {
+      $templates = array();
+      foreach ($systemTypes as $type) {
+        $tmp = objects::getTemplates($type);
+        foreach ($tmp as $tdn => $tlabel) {
+          $templates[$type.':'.$tdn] = $tlabel;
+        }
+      }
+      $this->attributesAccess['matching'] = new CompositeAttribute(
+        _('Create a system based on this inventory'), 'matching',
+        array(
+          new SelectAttribute(
+            '', 'template',
+            'matching_template', TRUE,
+            array_keys($templates), '',
+            array_values($templates)
+          ),
+          new SelectAttribute(
+            '', 'mac address',
+            'matching_macaddress', TRUE,
+            $this->macAddress
+          ),
+          new ButtonAttribute(
+            '', 'button',
+            'matching_button', _('Create'),
+            'createSystem'
+          )
+        ),
+        FALSE, FALSE,
+        '', _('No matching system')
+      );
+      if (empty($templates)) {
+        $this->attributesAccess['matching']->setDisabled(TRUE);
+      }
+      $this->attributesAccess['matching']->setParent($this);
+      $this->attributesAccess['matching']->setLinearRendering(TRUE);
+    }
+  }
+
+  function createSystem()
+  {
+    list ($type, $dn) = explode(':', $_POST['matching_template'], 2);
+    $infos = objects::infos($type);
+
+    $values = array(
+      $infos['mainTab'] => array(
+        'cn'            => $this->hardware_infos['hardware']['objects']['hardware0']['NAME'],
+        'ipHostNumber'  => $this->ipHostNumber,
+        'macAddress'    => $_POST['matching_macaddress'],
+      )
+    );
+
+    $template = new template($type, $dn);
+    $template->reset();
+    $template->deserialize($values);
+    $tabObject = $template->apply();
+    $msgs = $tabObject->save();
+    if (count($msgs)) {
+      msg_dialog::displayChecks($msgs);
+    } else {
+      $this->attributesAccess['matching'] = new DisplayAttribute(
+        _('System'), _('System entry matching this inventory'),
+        'matching'
+      );
+      $this->attributesAccess['matching']->setParent($this);
+      $this->attributesAccess['matching']->setAllowHTML(TRUE);
+      $this->updateMatching();
+    }
+  }
 }
 ?>
diff --git a/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc b/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
index 6bd9d9942a5efe7aba7c14968f5f45e5d759be2b..d04cca512111cd90009001d5fcfaed677bd94def 100644
--- a/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
+++ b/fusioninventory/admin/systems/fusioninventory/class_fiInventoryAgent.inc
@@ -77,7 +77,7 @@ class fiInventoryAgent extends simplePlugin
       'plShortName'   => _('FusionInventory'),
       'plDescription' => _('FusionInventory agent configuration'),
       'plPriority'    => 90,
-      'plObjectType'  => array('winstation', 'workstation', 'server'),
+      'plObjectType'  => array('workstation', 'server'),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
diff --git a/fusioninventory/html/collect.php b/fusioninventory/html/collect.php
index 9db8bd756aa2856041559f4e2d4e0d053a75c22a..ee5fc51e9eac7b880994cd774a6e0f2771ba75cf 100644
--- a/fusioninventory/html/collect.php
+++ b/fusioninventory/html/collect.php
@@ -1,6 +1,7 @@
 <?php
-/* Collect inventory and store them in the LDAP
-   Usage : fusioninventory-agent --server http://server/fusiondirectory/collect.php */
+// Collect inventory and store them in the LDAP
+// Usage :
+//  fusioninventory-agent --server http://server/fusiondirectory/collect.php
 require_once('../include/php_setup.inc');
 require_once('functions.inc');
 require_once('variables.inc');
@@ -17,13 +18,13 @@ if (strpos($http_raw_post_data, "<?xml") === 0) {
 } elseif ($xml = @gzuncompress($http_raw_post_data)) {
     $compressmode = "gzcompress";
 } elseif ($xml = @gzinflate ("\x1f\x8b\x08\x00\x00\x00\x00\x00".$http_raw_post_data)) {
-    /* OCS agent 2.0 Compatibility, but return in gzcompress */
+    // ** OCS agent 2.0 Compatibility, but return in gzcompress
     $compressmode = "gzdeflate";
     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 */
+    // ** OCS agent 2.0 Compatibility, but return in gzcompress
     $compressmode = "gzdeflate";
     if (strstr($xml, "<QUERY>PROLOG</QUERY>") && !strstr($xml, "<TOKEN>")) {
         $compressmode = "gzcompress";
diff --git a/fusioninventory/html/plugins/inventory.css b/fusioninventory/html/plugins/inventory.css
index 31300b5a2b15be7766a9b0622ace12352ef5d3d1..72fd8b5333c842c55a32f9a51243d2a18fd71da9 100644
--- a/fusioninventory/html/plugins/inventory.css
+++ b/fusioninventory/html/plugins/inventory.css
@@ -10,7 +10,6 @@ list-style-type: none;
 html.ltr ul.inventory li div {
 margin-left: 20px;
 }
-
 html.rtl ul.inventory li div {
 margin-right: 20px;
 }
@@ -19,7 +18,6 @@ html.ltr ul.inventory li table.list th {
 text-align: left;
 padding-right: 10px;
 }
-
 html.rtl ul.inventory li table.list th {
 text-align: right;
 padding-left: 10px;
@@ -28,7 +26,6 @@ padding-left: 10px;
 ul.inventory li table.table {
 border-collapse: collapse;
 }
-
 ul.inventory li table.table, ul.inventory li table.table td, ul.inventory li table.table th {
 border: 1px solid black;
 }
diff --git a/fusioninventory/locale/ar/fusiondirectory.po b/fusioninventory/locale/ar/fusiondirectory.po
index 0781480ebda016a92dfb7748bba32453273f8e99..7f10d00d164c38d0f9646d0cfab8266181495230 100644
--- a/fusioninventory/locale/ar/fusiondirectory.po
+++ b/fusioninventory/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Ù†Ø¸Ø§Ù…"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/ca/fusiondirectory.po b/fusioninventory/locale/ca/fusiondirectory.po
index ca0883e3cfad507edcd28f0bd517d090a9e4342b..f6a59ca6ff4fd15206cbb7d5d2c710ab27def21e 100644
--- a/fusioninventory/locale/ca/fusiondirectory.po
+++ b/fusioninventory/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,10 +63,11 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³ %s/%s del FusionDirectori no Ã©s llegible. S'estÃ  avortant."
+msgstr ""
+"La configuraciÃ³ %s/%s del FusionDirectori no Ã©s llegible. S'estÃ  avortant."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -165,31 +167,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/cs_CZ/fusiondirectory.po b/fusioninventory/locale/cs_CZ/fusiondirectory.po
index 11043ef26a9746196542dfbdd46ec63c2afc0820..e10fb23d7adf5520251b066d26a6a5733d7921ad 100644
--- a/fusioninventory/locale/cs_CZ/fusiondirectory.po
+++ b/fusioninventory/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr "ObojÃ"
 msgid "IP or Mac address"
 msgstr "IP Äi MAC adresa"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "NastavenÃ %s/%s FusionDirectory nenÃ ÄitelnÃ©. Akce byla zruÅ¡ena."
@@ -86,15 +87,15 @@ msgstr "OperaÄnÃ systÃ©my"
 
 #: admin/inventory/inventory-list.xml:50
 msgid "Actions"
-msgstr "Akce"
+msgstr "akce"
 
 #: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
 msgid "Edit"
-msgstr "Upravit"
+msgstr "upravit"
 
 #: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
 msgid "Remove"
-msgstr "Odstranit"
+msgstr "odebrat"
 
 #: admin/inventory/class_inventoryManagement.inc:36
 msgid "Inventory objects"
@@ -106,11 +107,11 @@ msgstr "ProchÃ¡zet objekty inventÃ¡Å™e"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:30
 msgid "Configuration"
-msgstr "NastavenÃ"
+msgstr "nastavenÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server"
-msgstr "Server"
+msgstr "server"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server which FI will send inventory infos"
@@ -151,7 +152,7 @@ msgstr "SÃÅ¥ovÃ© rozhranÃ, na kterÃ©m oÄekÃ¡vat spojenÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
 msgid "Port"
-msgstr "Port"
+msgstr "port"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "Trust"
@@ -159,37 +160,65 @@ msgstr "DÅ¯vÄ›ra"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr "IP adresy poÄÃtaÄÅ¯, ze kterÃ½ch je moÅ¾nÃ© spouÅ¡tÄ›t Ãºkony inventarizace z webovÃ©ho rozhranÃ"
+msgstr ""
+"IP adresy poÄÃtaÄÅ¯, ze kterÃ½ch je moÅ¾nÃ© spouÅ¡tÄ›t Ãºkony inventarizace z "
+"webovÃ©ho rozhranÃ"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "NastavenÃ agenta FusionInventory"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "InventÃ¡Å™"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "ProhlÃÅ¾eÄ inventÃ¡Å™e"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Objekt inventÃ¡Å™e"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "SystÃ©m"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
-msgstr "Hardware"
+msgstr "hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
-msgstr "ProgramovÃ© vybavenÃ"
+msgstr "software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
-msgstr "UÅ¾ivatelÃ©"
+msgstr "uÅ¾ivatelÃ©"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr "Procesy"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "vytvoÅ™it"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/de/fusiondirectory.po b/fusioninventory/locale/de/fusiondirectory.po
index 8618ec66e53aac2e7387850762b0bb981e94c99d..64651453dfa6a17c66e07596996c16bf504a9c87 100644
--- a/fusioninventory/locale/de/fusiondirectory.po
+++ b/fusioninventory/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr "Beide"
 msgid "IP or Mac address"
 msgstr "IP- oder MAC-Adresse"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr "FusionInventory-Agentkonfiguration"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "Inventar"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "Inventarbetrachter"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Inventarobjekt"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "System"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Benutzer"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Anlegen"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/el_GR/fusiondirectory.po b/fusioninventory/locale/el_GR/fusiondirectory.po
index 5764d4c8e253a386164d73818243f58be2417b84..9e03f842f239084f125f7d413152c6dff4a04c53 100644
--- a/fusioninventory/locale/el_GR/fusiondirectory.po
+++ b/fusioninventory/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,10 +63,11 @@ msgstr "ÎšÎ±Î¹ Ï„Î± Î´ÏÎ¿"
 msgid "IP or Mac address"
 msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Î® Mac address"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ FusionDirectory %s/%s  Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³Î½ÏŽÏƒÎ¹Î¼ÎµÏ‚. Î‘ÎºÏÏÏ‰ÏƒÎ·."
+msgstr ""
+"ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ %s/%s  Ï„Î¿Ï… FusionDirectory Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³Î½ÏŽÏƒÎ¹Î¼ÎµÏ‚. Î•Î³ÎºÎ±Ï„Î¬Î»ÎµÎ¹ÏˆÎ·"
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -111,7 +112,7 @@ msgstr "Î”Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ·"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server"
-msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:33
 msgid "Server which FI will send inventory infos"
@@ -160,37 +161,65 @@ msgstr "Î•Î¼Ï€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î·"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr "ÎŸÎ¹ ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½ÎµÏ‚ IPs Ï€Î¿Ï… Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏƒÎ¿Ï…Î½ ÎµÏÎ³Î±ÏƒÎ¯Î± Î±Ï€Î¿Î³ÏÎ±Ï†Î®Ï‚ Î¼ÎÏƒÏ‰ web interface"
+msgstr ""
+"ÎŸÎ¹ ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½ÎµÏ‚ IPs Ï€Î¿Ï… Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏƒÎ¿Ï…Î½ ÎµÏÎ³Î±ÏƒÎ¯Î± Î±Ï€Î¿Î³ÏÎ±Ï†Î®Ï‚ Î¼ÎÏƒÏ‰ web "
+"interface"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· FusionInventory agent"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "Î‘Ï€Î¿Î³ÏÎ±Ï†Î®"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î±Ï€Î¿Î³ÏÎ±Ï†Î®Ï‚"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Î‘Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î±Ï€Î¿Î³ÏÎ±Ï†Î®Ï‚"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Î£ÏÏƒÏ„Î·Î¼Î±"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Î¥Î»Î¹ÎºÏŒ"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
-msgstr "Î›Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ"
+msgstr "Î›Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ."
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr "Î”Î¹ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/en/fusiondirectory.po b/fusioninventory/locale/en/fusiondirectory.po
index cd9d5a9b05e347b0e77d224c032afed7379d884d..7f275e378cb8d41cadde4b848eba9750835eb3c0 100644
--- a/fusioninventory/locale/en/fusiondirectory.po
+++ b/fusioninventory/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +165,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/es/fusiondirectory.po b/fusioninventory/locale/es/fusiondirectory.po
index 56160f25c532dc9d7ec97d6c3bf3d77cc097d328..5c6907f599a5e1109818109984bb66f9aadafd03 100644
--- a/fusioninventory/locale/es/fusiondirectory.po
+++ b/fusioninventory/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,10 +63,11 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -165,31 +167,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Sistema"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Crear"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/es_CO/fusiondirectory.po b/fusioninventory/locale/es_CO/fusiondirectory.po
index 330471f28cd1eda069f0fd6ec3c32952d9e1a098..860a97d3345921e3a5a663a4eea9086794a1d808 100644
--- a/fusioninventory/locale/es_CO/fusiondirectory.po
+++ b/fusioninventory/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,10 +63,12 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, 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."
+msgstr ""
+"La configuraciÃ³n %s/%s de FusionDirectory no tiene permisos de lectura. "
+"Abortado."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -165,31 +168,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Crear"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/es_VE/fusiondirectory.po b/fusioninventory/locale/es_VE/fusiondirectory.po
index 5a2122f06a04aab7dcaed6907c10ad1ae23a7ece..2f3d7bea11f657f9c827dc369987c1a1a7638996 100644
--- a/fusioninventory/locale/es_VE/fusiondirectory.po
+++ b/fusioninventory/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,10 +63,11 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -165,31 +167,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Sistema"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Crear"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/fa_IR/fusiondirectory.po b/fusioninventory/locale/fa_IR/fusiondirectory.po
index 2d322eef831f43f4eda2f89e7a50ee2cd662175f..1a86ae4d094d527e0154dac61ae69182cdd7a311 100644
--- a/fusioninventory/locale/fa_IR/fusiondirectory.po
+++ b/fusioninventory/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +165,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/fi_FI/fusiondirectory.po b/fusioninventory/locale/fi_FI/fusiondirectory.po
index f1a135ad79f8d17c7922a038bf9c1429f3ed4a06..0ede0bd13fe768d4ceeb2aedb3c2e25e359f9f6c 100644
--- a/fusioninventory/locale/fi_FI/fusiondirectory.po
+++ b/fusioninventory/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Luo"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/fr/fusiondirectory.po b/fusioninventory/locale/fr/fusiondirectory.po
index eeaea0954863493e19f42e93f035ccc707e3ffbb..b9d56a866c3c16311fdb6c85cefff4f0dca8cf33 100644
--- a/fusioninventory/locale/fr/fusiondirectory.po
+++ b/fusioninventory/locale/fr/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +49,7 @@ msgstr "CritÃ¨re pour lier un inventaire Ã  un systÃ¨me"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Mac address"
-msgstr "Adresse mac"
+msgstr "Adresse Mac"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP address"
@@ -65,14 +63,16 @@ msgstr "Les deux"
 msgid "IP or Mac address"
 msgstr "Adresse IP ou Mac"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, 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."
+msgstr ""
+"Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. "
+"Abandon."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
-msgstr "SANSÂ TITRE"
+msgstr "Pas de titre"
 
 #: admin/inventory/inventory-list.xml:28
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
@@ -93,7 +93,7 @@ msgstr "Actions"
 
 #: admin/inventory/inventory-list.xml:61 admin/inventory/inventory-list.xml:85
 msgid "Edit"
-msgstr "Ã‰diter"
+msgstr "Editer"
 
 #: admin/inventory/inventory-list.xml:68 admin/inventory/inventory-list.xml:92
 msgid "Remove"
@@ -168,31 +168,57 @@ msgstr "IPs autorisÃ©es Ã  lancer des tÃ¢ches d'inventaire via l'interface web"
 msgid "FusionInventory agent configuration"
 msgstr "Configuration de l'agent FusionInventory"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "Affichage de l'inventaire"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Objet d'inventaire"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr "systÃ¨me correspondant"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "SystÃ¨me"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr "l'entrÃ©e du systÃ¨me correspondant Ã  cet inventaire"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "MatÃ©riel"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Logiciel"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr "Processus"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr "CrÃ©er un systÃ¨me basÃ© sur cet inventaire"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "CrÃ©er"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr "Pas de systÃ¨me correspondant"
diff --git a/fusioninventory/locale/hu_HU/fusiondirectory.po b/fusioninventory/locale/hu_HU/fusiondirectory.po
index 29bcd778abe183a892d51637929571000186f603..809fb1d3b7c7b0ec8ec128c2299e876ce93ca1e0 100644
--- a/fusioninventory/locale/hu_HU/fusiondirectory.po
+++ b/fusioninventory/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "FelhasznÃ¡lÃ³k"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/id/fusiondirectory.po b/fusioninventory/locale/id/fusiondirectory.po
index 99439ccfad7bd6e38ee78d481cac145b91de072d..8532b37d1e418d0fe06dee615bc45c1b26f6a8b7 100644
--- a/fusioninventory/locale/id/fusiondirectory.po
+++ b/fusioninventory/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +165,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/it_IT/fusiondirectory.po b/fusioninventory/locale/it_IT/fusiondirectory.po
index 6afcca5660a59904db842aa8d76b30b45541c09c..dad2b06d5f51d9b89eb443d44a8e4fd1878f8afe 100644
--- a/fusioninventory/locale/it_IT/fusiondirectory.po
+++ b/fusioninventory/locale/it_IT/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -63,10 +63,11 @@ msgstr "Entrambi"
 msgid "IP or Mac address"
 msgstr "Indirizzo IP o MAC"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione %s/%s non Ã¨ leggibile. Operazione Annullata."
+msgstr ""
+"Il file di configurazione %s/%s non Ã¨ leggibile. Operazione Annullata."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
@@ -160,37 +161,65 @@ msgstr "Fiducia"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr "Indirizzi IP permessi per lanciare i compiti dell'inventario attraverso un'interfaccia Web"
+msgstr ""
+"Indirizzi IP permessi per lanciare i compiti dell'inventario attraverso "
+"un'interfaccia Web"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Configurazione dell'agente Fusioninventory"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "Inventario"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "Visualizzatore inventario"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Oggetti d'inventario"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr "Sistema di ricerca"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Sistema"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr "Voce del sistema di corrispondenza di questo inventario"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Programma"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Utenti"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr "Processi"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr "Creare un sistema basato su questo inventario"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Crea"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr "Nessun sistema di corrispondenza"
diff --git a/fusioninventory/locale/lv/fusiondirectory.po b/fusioninventory/locale/lv/fusiondirectory.po
index 9a1d8e8643c212a7cfd3d92d2f683169a6a2b5db..9ae2fe4c5f1cb1bb80b261a905bb4dbaedcbdba8 100644
--- a/fusioninventory/locale/lv/fusiondirectory.po
+++ b/fusioninventory/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "LietotÄji"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Izveidot"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/nb/fusiondirectory.po b/fusioninventory/locale/nb/fusiondirectory.po
index b42c107d1793d44a3eb47f784030cbaaebb1079f..e5bae6eaeb2ab19cda5e1394e448da8838176b4a 100644
--- a/fusioninventory/locale/nb/fusiondirectory.po
+++ b/fusioninventory/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Opprett"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/nl/fusiondirectory.po b/fusioninventory/locale/nl/fusiondirectory.po
index 98a3d9e790f0456b986081d6274bde5a59becb89..5a02c53e6c35ad85841f26583272545df1e3820f 100644
--- a/fusioninventory/locale/nl/fusiondirectory.po
+++ b/fusioninventory/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: config/fusioninventory/class_fiConfig.inc:28
 msgid "FusionInventory configuration"
-msgstr ""
+msgstr "FusionInventory configuratie"
 
 #: config/fusioninventory/class_fiConfig.inc:29
 msgid "FusionDirectory FusionInventory plugin configuration"
-msgstr ""
+msgstr "FusionDirectory FusionInventory plugin configuratie"
 
 #: config/fusioninventory/class_fiConfig.inc:41
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:77
 msgid "FusionInventory"
-msgstr ""
+msgstr "FusionInventory"
 
 #: config/fusioninventory/class_fiConfig.inc:44
 msgid "Inventory RDN"
@@ -56,20 +57,20 @@ msgstr "IP adres"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "Both"
-msgstr ""
+msgstr "Beide"
 
 #: config/fusioninventory/class_fiConfig.inc:52
 msgid "IP or Mac address"
-msgstr ""
+msgstr "IP of MAC-adres"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 
 #: admin/inventory/inventory-list.xml:7
 msgid "NO LABEL"
-msgstr ""
+msgstr "Geen label"
 
 #: admin/inventory/inventory-list.xml:28
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
@@ -126,7 +127,7 @@ msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
 msgid "Wait"
-msgstr ""
+msgstr "Wachten"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:42
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:60
@@ -135,15 +136,15 @@ msgstr ""
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:49
 msgid "Web Interface"
-msgstr ""
+msgstr "Web interface"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
 msgid "Disable web interface"
-msgstr ""
+msgstr "Uitschakelen van de webinterface"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:52
 msgid "Do not use web interface"
-msgstr ""
+msgstr "De webinterface niet gebruiken"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:56
 msgid "Network interface to listen to"
@@ -155,7 +156,7 @@ msgstr "Poort"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "Trust"
-msgstr ""
+msgstr "Vertrouwen"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "Systeem"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "Gebruikers"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Aanmaken"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/pl/fusiondirectory.po b/fusioninventory/locale/pl/fusiondirectory.po
index fe3d83b31eacc4ebc3adba9fa1afa87970747ce7..f1c241f05a7e4c30bebbbc9c31cecc21a210a68e 100644
--- a/fusioninventory/locale/pl/fusiondirectory.po
+++ b/fusioninventory/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "System"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "UÅ¼ytkownicy"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "UtwÃ³rz"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/pt/fusiondirectory.po b/fusioninventory/locale/pt/fusiondirectory.po
index 1c2e38df8d4628c7440fd38d1cda87eae841130c..c9f397aeb7d2e742a915d6f7489dbbfb9e0a02df 100644
--- a/fusioninventory/locale/pt/fusiondirectory.po
+++ b/fusioninventory/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "UsuÃ¡rios"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Criar"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/pt_BR/fusiondirectory.po b/fusioninventory/locale/pt_BR/fusiondirectory.po
index b47b9100740d136fdcaa5ec7744210fbe4cdaf46..770dcef49f3e04f0368af12b9c4131027ff7ba05 100644
--- a/fusioninventory/locale/pt_BR/fusiondirectory.po
+++ b/fusioninventory/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr "Ambos"
 msgid "IP or Mac address"
 msgstr "IP ou endereÃ§o MAC"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, 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."
@@ -159,37 +160,64 @@ msgstr "Confiar"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:65
 msgid "IPs allowed to launch inventory task through web interface"
-msgstr "IPs autorizados a realizar tarefas de inventÃ¡rio atravÃ©s da interface web"
+msgstr ""
+"IPs autorizados a realizar tarefas de inventÃ¡rio atravÃ©s da interface web"
 
 #: admin/systems/fusioninventory/class_fiInventoryAgent.inc:78
 msgid "FusionInventory agent configuration"
 msgstr "Agente de configuraÃ§Ã£o "
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr "InventÃ¡rio"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr "Visualizador de inventÃ¡rio"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr "Objeto de inventÃ¡rio"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr "Hardware"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "Software"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "UsuÃ¡rios"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr "Processos"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Criar"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/ru/fusiondirectory.po b/fusioninventory/locale/ru/fusiondirectory.po
index 35574668a496799a8a3346f9b01763f26f39d8ad..b6ec7067a3a43ab96e8d03c55c824f11301304a0 100644
--- a/fusioninventory/locale/ru/fusiondirectory.po
+++ b/fusioninventory/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr "ÐžÐ±Ð°"
 msgid "IP or Mac address"
 msgstr "IP Ð¸Ð»Ð¸ MAC Ð°Ð´Ñ€ÐµÑ"
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ FusionDirectory %s/%s Ð½Ðµ Ñ‡Ð¸Ñ‚Ð°ÐµÐ¼Ð°. ÐŸÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/ru@petr1708/fusiondirectory.po b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
index 826379e31c5ee404a104774f11056c9ee1461fd7..3b3a30e8eae0ced926af3984deb9097d4bc253c2 100644
--- a/fusioninventory/locale/ru@petr1708/fusiondirectory.po
+++ b/fusioninventory/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +165,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/sv/fusiondirectory.po b/fusioninventory/locale/sv/fusiondirectory.po
index 08622fee789cd90c23462d694e8a232cd16bae17..9abbd196710d8b0e544a8b9876d316e4058b5cf9 100644
--- a/fusioninventory/locale/sv/fusiondirectory.po
+++ b/fusioninventory/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s Ã¤r inte lÃ¤sbar. Avbryter."
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "AnvÃ¤ndare"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Skapa"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/ug/fusiondirectory.po b/fusioninventory/locale/ug/fusiondirectory.po
index e6625bd4b108b797fc2f651f539c92113a0832e9..194bfebb1b36a81980ee1b81c0493412d771dd64 100644
--- a/fusioninventory/locale/ug/fusiondirectory.po
+++ b/fusioninventory/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +165,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/vi_VN/fusiondirectory.po b/fusioninventory/locale/vi_VN/fusiondirectory.po
index def148d8c7f5edfc8ea2ef67272bff3954eb6976..91e716ec9b695fd633f916c09fa7d83160af7972 100644
--- a/fusioninventory/locale/vi_VN/fusiondirectory.po
+++ b/fusioninventory/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "NgÆ°á»i dÃ¹ng"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "Táº¡o "
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/fusioninventory/locale/zh/fusiondirectory.po b/fusioninventory/locale/zh/fusiondirectory.po
index f958c73d07b97505f0801d7f76ad17b6d552a7f3..30795fdfb37c3e77702aa69b9daadc0661f6c402 100644
--- a/fusioninventory/locale/zh/fusiondirectory.po
+++ b/fusioninventory/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgstr ""
 msgid "IP or Mac address"
 msgstr ""
 
-#: html/collect.php:74
+#: html/collect.php:75
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
@@ -165,31 +166,57 @@ msgstr ""
 msgid "FusionInventory agent configuration"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:67
+#: admin/systems/fusioninventory/class_fiInventory.inc:69
 msgid "Inventory"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:68
+#: admin/systems/fusioninventory/class_fiInventory.inc:70
 msgid "Inventory Viewer"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:73
-#: admin/systems/fusioninventory/class_fiInventory.inc:77
+#: admin/systems/fusioninventory/class_fiInventory.inc:75
+#: admin/systems/fusioninventory/class_fiInventory.inc:79
 msgid "Inventory object"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:91
+#: admin/systems/fusioninventory/class_fiInventory.inc:93
+msgid "Matching system"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System"
+msgstr "ç³»ç»Ÿ"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:96
+#: admin/systems/fusioninventory/class_fiInventory.inc:372
+msgid "System entry matching this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:102
 msgid "Hardware"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:97
+#: admin/systems/fusioninventory/class_fiInventory.inc:108
 msgid "Software"
 msgstr ""
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:103
+#: admin/systems/fusioninventory/class_fiInventory.inc:114
 msgid "Users"
 msgstr "ç”¨æˆ·"
 
-#: admin/systems/fusioninventory/class_fiInventory.inc:109
+#: admin/systems/fusioninventory/class_fiInventory.inc:120
 msgid "Processes"
 msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:320
+msgid "Create a system based on this inventory"
+msgstr ""
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:335
+msgid "Create"
+msgstr "åˆ›å»º"
+
+#: admin/systems/fusioninventory/class_fiInventory.inc:340
+msgid "No matching system"
+msgstr ""
diff --git a/gpg/addons/gpg/class_pgpServerInfo.inc b/gpg/addons/gpg/class_pgpServerInfo.inc
index 4b6babe27ad8dafff8f938e07d7f3ea0af15762b..98d9a39b83083baba92b08512ee2ea44a542061f 100644
--- a/gpg/addons/gpg/class_pgpServerInfo.inc
+++ b/gpg/addons/gpg/class_pgpServerInfo.inc
@@ -84,10 +84,14 @@ class pgpServerInfo extends simplePlugin
     );
   }
 
-  protected function ldap_save ($cleanup = TRUE)
+  protected function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
+
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     /* Create the new branch if non-existing */
     $ldap = $config->get_ldap_link();
@@ -97,8 +101,7 @@ class pgpServerInfo extends simplePlugin
       $ldap->cd($config->current['BASE']);
       $ldap->create_missing_trees($this->pgpBaseKeySpaceDN);
       if (!$ldap->success()) {
-        msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(),
-                            $this->pgpBaseKeySpaceDN, LDAP_MOD, get_class()));
+        $errors[] = msgPool::ldaperror($ldap->get_error(), $this->pgpBaseKeySpaceDN, LDAP_MOD, get_class());
       }
     }
     /* Delete the old branch if empty */
@@ -107,7 +110,8 @@ class pgpServerInfo extends simplePlugin
       $ldap->cat($dn);
       if ($ldap->count()) {
         /* Old branch exists */
-        $ldap->ls('(objectClass=*)', $dn);
+        $ldap->cd($dn);
+        $ldap->search('(objectClass=*)');
         if (!$ldap->count()) {
           /* Old branch is empty */
           @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $dn, "Deleting old empty branch");
@@ -117,6 +121,7 @@ class pgpServerInfo extends simplePlugin
         }
       }
     }
+    return $errors;
   }
 }
 ?>
diff --git a/gpg/locale/ar/fusiondirectory.po b/gpg/locale/ar/fusiondirectory.po
index da8ed94c6fc89db74ac080510caad8d7ea70be86..032bc46bccfc797daf5fe82bda37324c67d9f8ce 100644
--- a/gpg/locale/ar/fusiondirectory.po
+++ b/gpg/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr ""
diff --git a/gpg/locale/ca/fusiondirectory.po b/gpg/locale/ca/fusiondirectory.po
index 9ef223d73b6a33d9d336524774d396d270c9a6ee..d22a43bfd5d01d053c1b32f3746ec7c57b8b4683 100644
--- a/gpg/locale/ca/fusiondirectory.po
+++ b/gpg/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error d'LDAP"
diff --git a/gpg/locale/cs_CZ/fusiondirectory.po b/gpg/locale/cs_CZ/fusiondirectory.po
index 0f6b96f09115f38add6afb3be978573a6860447d..24e8f365d4d2fbec002cf819c05c053886c962d4 100644
--- a/gpg/locale/cs_CZ/fusiondirectory.po
+++ b/gpg/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +36,7 @@ msgstr "Upravit GPG identifikÃ¡tory uÅ¾ivatele"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 msgid "Configuration error"
-msgstr "Chyba v nastavenÃ"
+msgstr "chyba v nastavenÃ"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 msgid "You need to configure GPG base dn through the addons section first"
@@ -48,7 +49,7 @@ msgstr "IdentifikÃ¡tor klÃÄe"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:139
 msgid "User ID"
-msgstr "IdentifikÃ¡tor uÅ¾ivatele"
+msgstr "ID uÅ¾ivatele"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:140
 msgid "Creation time"
@@ -56,7 +57,7 @@ msgstr "ÄŒas vytvoÅ™enÃ"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:141
 msgid "Expiration"
-msgstr "SkonÄenÃ platnosti"
+msgstr "VyprÅ¡enÃ platnosti"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
@@ -65,7 +66,7 @@ msgstr "Algoritmus"
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
 msgid "Size"
-msgstr "Velikost"
+msgstr "velikost"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:144
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:88
@@ -75,11 +76,11 @@ msgstr "Platnost odvolÃ¡na"
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:145
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:96
 msgid "Disabled"
-msgstr "Vypnuto"
+msgstr "zakÃ¡zÃ¡no"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Vyberte poÅ¾adovanÃ© poloÅ¾ky"
+msgstr "vyberte prosÃm poÅ¾adovanÃ© poloÅ¾ky"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:15
 msgid "PGP Key"
@@ -87,7 +88,7 @@ msgstr "PGP klÃÄ"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
-msgstr "UÅ¾ivatel"
+msgstr "uÅ¾ivatel"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
 msgid "Creation date"
@@ -95,11 +96,11 @@ msgstr "Datum vytvoÅ™enÃ"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
 msgid "Expiration date"
-msgstr "Datum skonÄenÃ platnosti"
+msgstr "Datum vyprÅ¡enÃ platnosti"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:72
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: addons/gpg/class_pgpServerInfo.inc:31 addons/gpg/class_pgpServerInfo.inc:32
 #: addons/gpg/class_pgpServerInfo.inc:38 addons/gpg/class_pgpServerInfo.inc:56
@@ -108,7 +109,7 @@ msgstr "Informace o GPG serveru"
 
 #: addons/gpg/class_pgpServerInfo.inc:60
 msgid "Software"
-msgstr "ProgramovÃ© vybavenÃ"
+msgstr "software"
 
 #: addons/gpg/class_pgpServerInfo.inc:60
 msgid "Which software this GPG key server is running"
@@ -133,7 +134,3 @@ msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev klÃÄÅ¯"
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr "VÄ›tev pod zÃ¡kladem, ve kterÃ© jsou uloÅ¾eny klÃÄe"
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Chyba LDAP"
diff --git a/gpg/locale/de/fusiondirectory.po b/gpg/locale/de/fusiondirectory.po
index 094ac89ac04ddf1a37064d9306d4020264abb95f..6e44a27e7d5e2aeb1dbf8235c140a69880cca748 100644
--- a/gpg/locale/de/fusiondirectory.po
+++ b/gpg/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
diff --git a/gpg/locale/el_GR/fusiondirectory.po b/gpg/locale/el_GR/fusiondirectory.po
index 7976a04f6a8349425fcabbe2477ce66cb1992723..8817371e2a27b440e2bee3e0fa5fc34ef15c19f4 100644
--- a/gpg/locale/el_GR/fusiondirectory.po
+++ b/gpg/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,7 +40,8 @@ msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 msgid "You need to configure GPG base dn through the addons section first"
-msgstr "Î˜Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ GPG base dn Î¼ÎÏƒÏ‰ Ï„Î·Î½ ÎµÎ½ÏŒÏ„Î·Ï„Î±Ï‚ Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Ï‰Î² Ï€ÏÏŽÏ„Î±"
+msgstr ""
+"Î˜Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ Ï„Î·Î½ GPG base dn Î¼ÎÏƒÏ‰ Ï„Î·Î½ ÎµÎ½ÏŒÏ„Î·Ï„Î±Ï‚ Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Ï‰Î² Ï€ÏÏŽÏ„Î±"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
@@ -80,7 +81,7 @@ msgstr "Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:11
 msgid "Please select the desired entries"
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¹Ï‚ ÎµÏ€Î¹Î¸Ï…Î¼Î·Ï„ÎÏ‚ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚"
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î¹Ï‚ ÎµÏ€Î¹Î¸Ï…Î¼Î·Ï„ÎÏ‚ ÎµÎ³Î³ÏÎ±Ï†ÎÏ‚"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:15
 msgid "PGP Key"
@@ -134,7 +135,3 @@ msgstr "ÎšÎ»ÎµÎ¹Î´Î¹Î¬ RDN"
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr "ÎšÎ»Î¬Î´Î¿Ï‚ ÎºÎ¬Ï„Ï‰ Î±Ï€ÏŒ Ï„Î·Î½ Î²Î¬ÏƒÎ· ÏŒÏ€Î¿Ï… Î±Ï€Î¿Î¸Î·ÎºÎµÏÎ¿Î½Ï„Î±Î¹ Ï„Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬"
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
diff --git a/gpg/locale/en/fusiondirectory.po b/gpg/locale/en/fusiondirectory.po
index dfb02d97f70bc05eeabfdaa49fba89b3634567c7..e6fb032a347d17bdaa7c406a91ad481a7a7f633a 100644
--- a/gpg/locale/en/fusiondirectory.po
+++ b/gpg/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: 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 f42c2d694673706a124cc96ce3e172921e0f477b..8ac47d2a555b3e6b67e3928eda058edc256cbd01 100644
--- a/gpg/locale/es/fusiondirectory.po
+++ b/gpg/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error LDAP"
diff --git a/gpg/locale/es_CO/fusiondirectory.po b/gpg/locale/es_CO/fusiondirectory.po
index f8542a49dde053f72df58ab34a4e8a1341745386..66b5bf72dcf99e7dfdf11ac18332851f9fa3c816 100644
--- a/gpg/locale/es_CO/fusiondirectory.po
+++ b/gpg/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error LDAP"
diff --git a/gpg/locale/es_VE/fusiondirectory.po b/gpg/locale/es_VE/fusiondirectory.po
index a77d5d73d9d5774722ad7d41d4df8e9c0ebf5736..b83900188ca88c2ba6ac16990c40be6e9d58cc19 100644
--- a/gpg/locale/es_VE/fusiondirectory.po
+++ b/gpg/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Error de LDAP"
diff --git a/gpg/locale/fa_IR/fusiondirectory.po b/gpg/locale/fa_IR/fusiondirectory.po
index 7deec9d0605cd38f7f317104ecd07911c5a3028b..2f107b702798b60e1234c070713f498dff580d54 100644
--- a/gpg/locale/fa_IR/fusiondirectory.po
+++ b/gpg/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Ø®Ø·Ø§ÛŒ LDAP"
diff --git a/gpg/locale/fi_FI/fusiondirectory.po b/gpg/locale/fi_FI/fusiondirectory.po
index 81611589d8bcdb2808a85ba6d98383d3bd3da89a..c0a1997812f5bcb407e56238b3c3b323d5727ba3 100644
--- a/gpg/locale/fi_FI/fusiondirectory.po
+++ b/gpg/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP virhe"
diff --git a/gpg/locale/fr/fusiondirectory.po b/gpg/locale/fr/fusiondirectory.po
index d4d59dcc547788a75cd7123c7f62722b4188a325..478ae215a186f7aff3b958f1215b6f0e4f82b0cd 100644
--- a/gpg/locale/fr/fusiondirectory.po
+++ b/gpg/locale/fr/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ã‰ric Deschamps <erdesc@free.fr>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +40,9 @@ msgstr "Erreur de configuration"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 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Â»"
+msgstr ""
+"Vous devez configurer d'abord le DN de base de GPG, dans la section "
+"Â«ConfigurationÂ»"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
@@ -136,7 +136,3 @@ msgstr "Branche des clÃ©s"
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr "Branche oÃ¹ seront stockÃ©es les clefs GPG"
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erreur LDAP"
diff --git a/gpg/locale/hu_HU/fusiondirectory.po b/gpg/locale/hu_HU/fusiondirectory.po
index 760a715a2a8465802fd9b53bf5632602b2c6ca77..8a85b8e552d799fd7fdbc2a11909bd28e7faec6c 100644
--- a/gpg/locale/hu_HU/fusiondirectory.po
+++ b/gpg/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr ""
diff --git a/gpg/locale/id/fusiondirectory.po b/gpg/locale/id/fusiondirectory.po
index 2f5f0bdb5d4270654694f9020359437a2368df4d..2b33b5db1fe9fe4cae2998062d1bc0a4e96e2564 100644
--- a/gpg/locale/id/fusiondirectory.po
+++ b/gpg/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr ""
diff --git a/gpg/locale/it_IT/fusiondirectory.po b/gpg/locale/it_IT/fusiondirectory.po
index 6bd92394fef54f743fd08b457b0b835350b91248..a484b70732bcbf5dc250104620ecb4cc411af097 100644
--- a/gpg/locale/it_IT/fusiondirectory.po
+++ b/gpg/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +40,8 @@ msgstr "Errore di configurazione"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 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"
+msgstr ""
+"Devi prima di tutto configurare la bse dn per GPG, nella sezione addons"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:138
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:40
@@ -136,7 +135,3 @@ msgstr "RDN chiavi"
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr "Ramo sotto la base nel quale saranno immagazzinate le chiavi"
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Errore LDAP"
diff --git a/gpg/locale/lv/fusiondirectory.po b/gpg/locale/lv/fusiondirectory.po
index 4ca3268904e29540bb4bc1c7cdaf9c0a694c1e4a..1f3de4ec91af31a354b4c296db361f97f6506884 100644
--- a/gpg/locale/lv/fusiondirectory.po
+++ b/gpg/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP kÄ¼Å«da"
diff --git a/gpg/locale/nb/fusiondirectory.po b/gpg/locale/nb/fusiondirectory.po
index db81ca125e18cafd3a7cfc9dfd381283dfb7f475..4cc975c1579a08be5bff9fc354f91a996b52060c 100644
--- a/gpg/locale/nb/fusiondirectory.po
+++ b/gpg/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-feil"
diff --git a/gpg/locale/nl/fusiondirectory.po b/gpg/locale/nl/fusiondirectory.po
index 4aed83859d3af8cb85ad62d522cd5e2a5c294cd8..bd5bf81f8c369b34b2cbcc44ab61acbe99323116 100644
--- a/gpg/locale/nl/fusiondirectory.po
+++ b/gpg/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,19 +20,19 @@ msgstr ""
 
 #: personal/gpg/class_gpgAccount.inc:31
 msgid "GPG keys"
-msgstr ""
+msgstr "GPG sleutel"
 
 #: personal/gpg/class_gpgAccount.inc:35
 msgid "GPG keys of this user"
-msgstr ""
+msgstr "GPG sleutels van deze gebruiker"
 
 #: personal/gpg/class_gpgAccount.inc:46
 msgid "GPG"
-msgstr ""
+msgstr "GPG"
 
 #: personal/gpg/class_gpgAccount.inc:47
 msgid "Edit user's GPG IDs"
-msgstr ""
+msgstr "Bewerk de gebruikers GPG IDs"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:62
 msgid "Configuration error"
@@ -60,7 +61,7 @@ msgstr ""
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:142
 msgid "Algorithm"
-msgstr ""
+msgstr "Algoritme"
 
 #: personal/gpg/pgpKeySelect/class_pgpKeySelect.inc:143
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:80
@@ -83,7 +84,7 @@ msgstr "Gelieve de gegevens te selecteren"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:15
 msgid "PGP Key"
-msgstr ""
+msgstr "PGP sleutel"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:48
 msgid "User"
@@ -91,7 +92,7 @@ msgstr "Gebruiker"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:56
 msgid "Creation date"
-msgstr ""
+msgstr "A"
 
 #: personal/gpg/pgpKeySelect/pgpKeySelect-list.xml:64
 msgid "Expiration date"
@@ -116,7 +117,7 @@ msgstr ""
 
 #: addons/gpg/class_pgpServerInfo.inc:65
 msgid "GPG version"
-msgstr ""
+msgstr "GPG versie"
 
 #: addons/gpg/class_pgpServerInfo.inc:65
 msgid "Which version of GPG this key server is running"
@@ -128,12 +129,8 @@ msgstr ""
 
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Keys RDN"
-msgstr ""
+msgstr "RDN sleutels"
 
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP fout"
diff --git a/gpg/locale/pl/fusiondirectory.po b/gpg/locale/pl/fusiondirectory.po
index 1ee26c5bc893725647d44efd81b99c587fbffaa9..038c5fcc2360fe738a72bd04bbe2decf0488f68d 100644
--- a/gpg/locale/pl/fusiondirectory.po
+++ b/gpg/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "bÅ‚Ä…d LDAP"
diff --git a/gpg/locale/pt/fusiondirectory.po b/gpg/locale/pt/fusiondirectory.po
index 30cc1adc3e195714c7e048e52a51c08db1433423..881f59725c3eb84a084706e2182f3412cc226783 100644
--- a/gpg/locale/pt/fusiondirectory.po
+++ b/gpg/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erro de LDAP"
diff --git a/gpg/locale/pt_BR/fusiondirectory.po b/gpg/locale/pt_BR/fusiondirectory.po
index 6a3554d4940e8fdc826af50654d635427ba062e4..312456bb3682e46b0182d71de626616c49ab0684 100644
--- a/gpg/locale/pt_BR/fusiondirectory.po
+++ b/gpg/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Erro de LDAP"
diff --git a/gpg/locale/ru/fusiondirectory.po b/gpg/locale/ru/fusiondirectory.po
index 6234ee2f2c50c003b3210c33291ff1a23add19fb..faaf2ce79a212b052d7c2d41b0cf927415a0a609 100644
--- a/gpg/locale/ru/fusiondirectory.po
+++ b/gpg/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -135,7 +134,3 @@ msgstr "RDN Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr "Ð’ÐµÑ‚ÐºÐ° Ð² ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð±ÑƒÐ´ÑƒÑ‚ Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒÑÑ ÐºÐ»ÑŽÑ‡Ð¸"
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
diff --git a/gpg/locale/ru@petr1708/fusiondirectory.po b/gpg/locale/ru@petr1708/fusiondirectory.po
index e1f86f9cc81f0a84cf58b1e52d740bdcdd213ba3..b841546d0797f592fe77c9f048807c96798974ba 100644
--- a/gpg/locale/ru@petr1708/fusiondirectory.po
+++ b/gpg/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr ""
diff --git a/gpg/locale/sv/fusiondirectory.po b/gpg/locale/sv/fusiondirectory.po
index 641757c5e5443ed29f8eb7f8d289fb75286d5dad..0aab4cb285eb20feea091f98b4720d0bedb17d95 100644
--- a/gpg/locale/sv/fusiondirectory.po
+++ b/gpg/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP-fel"
diff --git a/gpg/locale/ug/fusiondirectory.po b/gpg/locale/ug/fusiondirectory.po
index 2509cda5792459d0c5b4b83b7dc476f9caf2e71f..f5eb17b186c66e4f03aca71f7f33356503f8060a 100644
--- a/gpg/locale/ug/fusiondirectory.po
+++ b/gpg/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr ""
diff --git a/gpg/locale/vi_VN/fusiondirectory.po b/gpg/locale/vi_VN/fusiondirectory.po
index bac7ad366a86cfe8797a5b94b8271da6cfd0f660..19f28fc542d7a50d71f6ab8c301bbdc7f0b1259e 100644
--- a/gpg/locale/vi_VN/fusiondirectory.po
+++ b/gpg/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
diff --git a/gpg/locale/zh/fusiondirectory.po b/gpg/locale/zh/fusiondirectory.po
index 9fad6ad1bbf4bf340e4063ea7d1c20e32ef2a54b..a63212c3f29f4f9b008a523a64dcec4ac591a49d 100644
--- a/gpg/locale/zh/fusiondirectory.po
+++ b/gpg/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,3 @@ msgstr ""
 #: addons/gpg/class_pgpServerInfo.inc:74
 msgid "Branch under base in which keys are stored"
 msgstr ""
-
-#: addons/gpg/class_pgpServerInfo.inc:100
-msgid "LDAP error"
-msgstr "LDAP é”™è¯¯"
diff --git a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
index f6c6b5c1050dc3942d25eebd01ff0d71f0585b76..e0a6b9ea7a18740fdabc7d78ee9d9e183c622136 100644
--- a/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
+++ b/gpg/personal/gpg/pgpKeySelect/class_pgpKeySelect.inc
@@ -109,13 +109,13 @@ class pgpKeySelect extends simpleSelectManagement
 
   static function pgpSize($size)
   {
-    /* Remove useless 0 at the beginning */
+    // Remove useless 0 at the beginning
     return strval(intval($size));
   }
 
   static function pgpRevoked($value)
   {
-    /* Remove useless 0 at the beginning */
+    // Remove useless 0 at the beginning
     return ($value == 0?'No':'Yes');
   }
 }
@@ -195,7 +195,7 @@ class PgpKeyAttribute extends GenericDialogAttribute
     $headers    = array_values($this->displayed_values);
     $headers[]  = '';
     $div->SetHeaders($headers);
-    /* Updates and get display values */
+    // Updates and get display values
     $displays = $this->getDisplayValues();
     foreach ($displays as $key => $display_item) {
       $fields = array();
@@ -203,7 +203,7 @@ class PgpKeyAttribute extends GenericDialogAttribute
         if (isset($display_item[$field][0]) && !empty($display_item[$field][0])) {
           $display = $display_item[$field][0];
           if ($field == 'pgpKeySize') {
-            /* Remove useless 0 in front of the number */
+            // Remove useless 0 in front of the number
             $display = pgpKeySelect::pgpSize($display);
           } elseif ($field == 'pgpKeyCreateTime') {
             $display = pgpKeySelect::pgpDate($display);
diff --git a/ipmi/locale/ar/fusiondirectory.po b/ipmi/locale/ar/fusiondirectory.po
index f947d4058f857b7beddb9ad4261e218ad63d5f95..43e5214c26f73f82b32ecfab32eb8277c5ace21c 100644
--- a/ipmi/locale/ar/fusiondirectory.po
+++ b/ipmi/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ca/fusiondirectory.po b/ipmi/locale/ca/fusiondirectory.po
index 7298a178e71fc627e2b1635b1f62851707c2f641..a228a0b2c5773c56ba6f3f60146d06bcbb92d7b4 100644
--- a/ipmi/locale/ca/fusiondirectory.po
+++ b/ipmi/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/cs_CZ/fusiondirectory.po b/ipmi/locale/cs_CZ/fusiondirectory.po
index ae4b410b95d7048796ea2507f34a0429b3e8d1f5..92ce7b840711686e02e6a9cf0c51ae62f67100e4 100644
--- a/ipmi/locale/cs_CZ/fusiondirectory.po
+++ b/ipmi/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
-msgstr "IPMI klient"
+msgstr "Klient IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
@@ -39,16 +40,16 @@ msgstr "IP adresa IPMI rozhranÃ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no"
+msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no na IPMI"
+msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no k IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
-msgstr "Heslo uÅ¾ivatele"
+msgstr "heslo uÅ¾ivatele"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr "Heslo k uÅ¾ivatelskÃ©mu ÃºÄtu v IPMI"
+msgstr "Heslo uÅ¾ivatele IPMI"
diff --git a/ipmi/locale/de/fusiondirectory.po b/ipmi/locale/de/fusiondirectory.po
index 225614b0d975377fc3942feda0f04c8e591109d1..4a47a27a4679c25d301cd1a12462d1ed57e94696 100644
--- a/ipmi/locale/de/fusiondirectory.po
+++ b/ipmi/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/el_GR/fusiondirectory.po b/ipmi/locale/el_GR/fusiondirectory.po
index e34a9fdbbf1f04fdf744e0f0592c92ba4960f926..05d00e6b04c0fe1c2b1d53402f67a5eb2965cede 100644
--- a/ipmi/locale/el_GR/fusiondirectory.po
+++ b/ipmi/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +32,7 @@ msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï€ÎµÎ»Î¬Ï„Î· IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
-msgstr "Î— IP Ï„Î·Ï‚ "
+msgstr "IP"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP of the IPMI interface"
diff --git a/ipmi/locale/en/fusiondirectory.po b/ipmi/locale/en/fusiondirectory.po
index f2d3b1516610be2a8447afffbad4271887f782ce..144cf7054770413f0b2bc56c288510828ef10791 100644
--- a/ipmi/locale/en/fusiondirectory.po
+++ b/ipmi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ipmi/locale/es/fusiondirectory.po b/ipmi/locale/es/fusiondirectory.po
index a116196a2e6c9f63dff2a0fcc636d52a5433daa1..13d229a127b5bfe179e360ab481282c4056c3b75 100644
--- a/ipmi/locale/es/fusiondirectory.po
+++ b/ipmi/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/es_CO/fusiondirectory.po b/ipmi/locale/es_CO/fusiondirectory.po
index 86fb86fb24bc60f27e8180ccb01fb8a3c61d4fd0..e1668407c1c8bae6d5796ba0e7bf725d0f5e43f5 100644
--- a/ipmi/locale/es_CO/fusiondirectory.po
+++ b/ipmi/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/es_VE/fusiondirectory.po b/ipmi/locale/es_VE/fusiondirectory.po
index 701a6b97863cb190794dfa8c36cb840b861e9e9b..0256dc0dfa2e2a97055acd94fb72b617bf9d5140 100644
--- a/ipmi/locale/es_VE/fusiondirectory.po
+++ b/ipmi/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/fa_IR/fusiondirectory.po b/ipmi/locale/fa_IR/fusiondirectory.po
index d27609e1d3c633cef36e932593c4f39ec06d64d9..5463d45e95e6e4e83c4873a873819abdee17fa78 100644
--- a/ipmi/locale/fa_IR/fusiondirectory.po
+++ b/ipmi/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/fi_FI/fusiondirectory.po b/ipmi/locale/fi_FI/fusiondirectory.po
index a6f298fdeba0da63fc7d8dbe54b2b48ec43ceb34..5a7df5ee104447a1eade370dac5f6082440cdcd8 100644
--- a/ipmi/locale/fi_FI/fusiondirectory.po
+++ b/ipmi/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/fr/fusiondirectory.po b/ipmi/locale/fr/fusiondirectory.po
index a61d1cfc973e46e7470e10a4cb87047ba319b7a1..3d87b4fc37a9fd1a7acdd6488e6af5b31edb18d4 100644
--- a/ipmi/locale/fr/fusiondirectory.po
+++ b/ipmi/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +28,7 @@ msgstr "Ã‰dition des paramÃ¨tres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr "ParamÃ¨tres du client IPMI"
+msgstr "Ã‰dition des paramÃ¨tres du client IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
@@ -40,11 +40,11 @@ msgstr "Adresse IP de l'interface IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr "Compte utilisateur"
+msgstr "compte Utilisateur"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr "Compte utilisateur IPMI"
+msgstr "Compte utililisateur pour IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
@@ -52,4 +52,4 @@ msgstr "Mot de passe"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr "Mot de passe IPMI"
+msgstr "Mot de passe utilisateur"
diff --git a/ipmi/locale/hu_HU/fusiondirectory.po b/ipmi/locale/hu_HU/fusiondirectory.po
index ab63b98a532e46f5782ab40ed44c077ee0433f89..d52ba34ca7a87f8bb6dda9ed4415058f96d4540a 100644
--- a/ipmi/locale/hu_HU/fusiondirectory.po
+++ b/ipmi/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/id/fusiondirectory.po b/ipmi/locale/id/fusiondirectory.po
index 3e1866f10d63479c98c09338b76a3cfd7a5e748a..d9af0866378b404325bdb493df6b5dcaa21759a3 100644
--- a/ipmi/locale/id/fusiondirectory.po
+++ b/ipmi/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/it_IT/fusiondirectory.po b/ipmi/locale/it_IT/fusiondirectory.po
index 7f391e95397591403449dd094e8f3a00f0e1fe8d..e4bd215cdd00fc9b6f88a4daabc4e65ee2c3c584 100644
--- a/ipmi/locale/it_IT/fusiondirectory.po
+++ b/ipmi/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/lv/fusiondirectory.po b/ipmi/locale/lv/fusiondirectory.po
index a21e5919a47bceaebd626f509c8d16ba3129185d..91e11351e77741e1bb445ddcb8434bc36f635036 100644
--- a/ipmi/locale/lv/fusiondirectory.po
+++ b/ipmi/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/nb/fusiondirectory.po b/ipmi/locale/nb/fusiondirectory.po
index 8aefb6ebc190e6e561035f115f1abdff7fce5ef6..2b8d43bdd00f2a41a3feb334046762629a49303c 100644
--- a/ipmi/locale/nb/fusiondirectory.po
+++ b/ipmi/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/nl/fusiondirectory.po b/ipmi/locale/nl/fusiondirectory.po
index be66f7fa421617487bb7c7742b118f399bb806df..c0a42244b4ccff2f1147d5bfda5b89d155777449 100644
--- a/ipmi/locale/nl/fusiondirectory.po
+++ b/ipmi/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
-msgstr ""
+msgstr "IPMI client"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
-msgstr ""
+msgstr "Bewerk IPMI client instellingen"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr ""
+msgstr "IPMI client instellingen"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
@@ -35,11 +36,11 @@ msgstr "IP"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP of the IPMI interface"
-msgstr ""
+msgstr "IP van de IPMI interface"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
-msgstr ""
+msgstr "Gebruikers login"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
diff --git a/ipmi/locale/pl/fusiondirectory.po b/ipmi/locale/pl/fusiondirectory.po
index 4a6072e195597b68b7dd6b453d31dbda71b70dbc..beb78b1e1550b0095be5e038dae8f9344c26efa4 100644
--- a/ipmi/locale/pl/fusiondirectory.po
+++ b/ipmi/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/pt/fusiondirectory.po b/ipmi/locale/pt/fusiondirectory.po
index 125049a73077dd45b63b4d48904ba622e8973827..a35d3c2f3a3cf1a5c814be463ff22753fa459d5a 100644
--- a/ipmi/locale/pt/fusiondirectory.po
+++ b/ipmi/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/pt_BR/fusiondirectory.po b/ipmi/locale/pt_BR/fusiondirectory.po
index ba130a070ff900284900b20c4ac5662b885d887d..a3eaf4a97365ad6bb5396032306b9984c47b9833 100644
--- a/ipmi/locale/pt_BR/fusiondirectory.po
+++ b/ipmi/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ru/fusiondirectory.po b/ipmi/locale/ru/fusiondirectory.po
index 55fd7517ad03c915766976d5beac6e1ba42207c6..88f687c0068045c0b2d44c390eb8b45d5837924e 100644
--- a/ipmi/locale/ru/fusiondirectory.po
+++ b/ipmi/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: admin/systems/ipmi/class_ipmiClient.inc:31
 msgid "IPMI client"
-msgstr "ÐšÐ»Ð¸ÐµÐ½Ñ‚ IPMI"
+msgstr "IPMI ÐºÐ»Ð¸ÐµÐ½Ñ‚"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:32
 msgid "Edit IPMI client settings"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° IPMI"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ IPMI ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:45
 msgid "IPMI client settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð° IPMI"
+msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ IPMI ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP"
@@ -35,7 +36,7 @@ msgstr "IP"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:48
 msgid "IP of the IPMI interface"
-msgstr "IP Ð°Ð´Ñ€ÐµÑ IPMI Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°"
+msgstr "IP Ð¸Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ° IPMI"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "User login"
@@ -43,7 +44,7 @@ msgstr "Ð›Ð¾Ð³Ð¸Ð½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:52
 msgid "IPMI user login"
-msgstr "Ð›Ð¾Ð³Ð¸Ð½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ IPMI"
+msgstr "IPMI Ð»Ð¾Ð³Ð¸Ð½ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "User password"
@@ -51,4 +52,4 @@ msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
 #: admin/systems/ipmi/class_ipmiClient.inc:57
 msgid "IPMI user password"
-msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ IPMI"
+msgstr "IPMI Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
diff --git a/ipmi/locale/ru@petr1708/fusiondirectory.po b/ipmi/locale/ru@petr1708/fusiondirectory.po
index 93f6b7bf31a89a844d776a0879d6630dc49f983e..6478ed0d17e7993409c969faf26b7a0a1ae69fd2 100644
--- a/ipmi/locale/ru@petr1708/fusiondirectory.po
+++ b/ipmi/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/sv/fusiondirectory.po b/ipmi/locale/sv/fusiondirectory.po
index d9a53ddb0d6de308a2918186238c9668a3f0512d..844583872dec336d3fe7ea1e7f396841c152d500 100644
--- a/ipmi/locale/sv/fusiondirectory.po
+++ b/ipmi/locale/sv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/ug/fusiondirectory.po b/ipmi/locale/ug/fusiondirectory.po
index 794f21b3c69204e9cfa542decff22055a096b8ea..4206ce8b2f358f527ec08a7ed6c394047547bf70 100644
--- a/ipmi/locale/ug/fusiondirectory.po
+++ b/ipmi/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/vi_VN/fusiondirectory.po b/ipmi/locale/vi_VN/fusiondirectory.po
index f999d9e0fabc6a7d61fb799030233410cb98ae68..fd0b258156ff8ae4f66b05e251d1bb8ccec13749 100644
--- a/ipmi/locale/vi_VN/fusiondirectory.po
+++ b/ipmi/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ipmi/locale/zh/fusiondirectory.po b/ipmi/locale/zh/fusiondirectory.po
index 8a8fb213f4dc7dc5fd892053987633c4d0ce10ac..8ae21aeb69bf6e9ca2396641d8ddd6bf5c4782b8 100644
--- a/ipmi/locale/zh/fusiondirectory.po
+++ b/ipmi/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc b/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
deleted file mode 100644
index 27fc59cea9cb1eccd286ee628f52e664b839961f..0000000000000000000000000000000000000000
--- a/kolab2/admin/systems/services/kolab2/class_serviceKolab.inc
+++ /dev/null
@@ -1,310 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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 RelayHostKolabAttribute extends CompositeAttribute
-{
-  function __construct ($description, $ldapName, $acl = "", $label = "Composite attribute")
-  {
-    $attributes = array(
-      new BooleanAttribute (
-        _('Enable MX lookup for relayhost'), '', 'RelayMxSupport', FALSE, FALSE,
-        "", TRUE, FALSE
-      ),
-      new StringAttribute (_('Relay host'), _('Host used to relay mails'), 'relayhost')
-    );
-    parent::__construct ($description, $ldapName, $attributes, "", "", $acl, $label);
-  }
-
-  function readValues($value)
-  {
-    $values = array();
-    $values[0] = preg_match('/^\[/', $value);
-    $values[1] = preg_replace("/[\[\]]/", "", $value);
-    return $values;
-  }
-
-  function writeValues($values)
-  {
-    /* Adapt relayhost */
-    $value = preg_replace('/[\[\]]/', '', $values[1]);
-    if ($values[0] && ($value != "")) {
-      $value = "[".$value."]";
-    }
-    return $value;
-  }
-}
-
-class serviceKolab extends simpleService
-{
-  var $objectclasses  = array("top", "kolab");
-  var $displayHeader  = FALSE;
-  var $mainTab        = TRUE;
-
-  var $conflicts    = array("fdPostfixServer","GOhard");
-
-  static function plInfo()
-  {
-    return array(
-      'plShortName'     => _('Kolab 2 mail'),
-      'plDescription'   => _('Kolab 2 mail service'),
-      'plIcon'          => 'geticon.php?context=applications&icon=kolab2&size=16',
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
-    );
-  }
-
-
-  /*!
-   *  \brief The main function : information about attributes
-   */
-  static function getAttributesInfo ()
-  {
-    return array (
-      'section1' => array (
-        'name'  => _('Information'),
-        'attrs' => array (
-          new StringAttribute('', '', 'k', FALSE, 'kolab'),
-          new SetAttribute(new StringAttribute('', '', 'kolabHost')),
-          new StringAttribute(
-            _('Postfix mydomain'), _('Postfix domain name'),
-            'postfix-mydomain'
-          ),
-          new StringAttribute(
-            _('Cyrus admins'), _('Cyrus admins for kolab server'),
-            'cyrus-admins'
-          ),
-          new SetAttribute(
-            new StringAttribute(
-              _('Mail domains').', '._('Postfix mydestination'), _('Mail domains'),
-              'postfix-mydestination', FALSE
-            )
-          )
-        )
-      ),
-      'section2' => array (
-        'name'  => _('Services'),
-        'attrs' => array (
-          new BooleanAttribute (
-            _('POP3 service'), _('Enable POP3 service'),
-            'cyrus-pop3', FALSE, FALSE
-          ),
-          new BooleanAttribute (
-            _('POP3/SSL service'), _('Enable POP3/SSL service'),
-            'cyrus-pop3s', FALSE, TRUE
-          ),
-          new BooleanAttribute (
-            _('IMAP service'), _('Enable IMAP service'),
-            'cyrus-imap', FALSE, TRUE
-          ),
-          new BooleanAttribute (
-            _('IMAP/SSL service'), _('Enable IMAP/SSL service'),
-            'cyrus-imaps', FALSE, TRUE
-          ),
-          new BooleanAttribute (
-            _('Sieve service'), _('Enable Sieve service'),
-            'cyrus-sieve', FALSE, TRUE
-          ),
-          new BooleanAttribute (
-            _('FTP FreeBusy service (legacy)'),
-            _('FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)'),
-            'proftpd-ftp', FALSE, FALSE
-          ),
-          new BooleanAttribute (
-            _('HTTP FreeBusy service (legacy)'), '',
-            'apache-http', FALSE, TRUE
-          ),
-          new BooleanAttribute (
-            _('Amavis email scanning'), _('Amavis email scanning (virus/spam)'),
-            'postfix-enable-virus-scan', FALSE, TRUE
-          ),
-        )
-      ),
-      'section3' => array (
-        'name' => _('Quota settings'),
-        'attrs' => array (
-          new IntAttribute (
-            _('Quota occupation limit before warning users (%)'),
-            _('Warn users when using more than X% of their mail quota'),
-            'cyrus-quotawarn', FALSE,
-            /* min and max */
-            FALSE, FALSE,
-            /* default value */
-            80
-          )
-        )
-      ),
-      'section4' => array (
-        'name' => _('Free/Busy settings'),
-        'attrs' => array (
-          new BooleanAttribute (
-            _('Allow unauthenticated downloading of Free/Busy information'),
-            _('Allow unauthenticated downloading of Free/Busy information'),
-            'apache-allow-unauthenticated-fb', FALSE, TRUE
-          ),
-          new IntAttribute (
-            _('Number of days to include when creating free/busy lists'),
-            _('Include data from X days in the past when creating free/busy lists'),
-            'kolabFreeBusyFuture', FALSE,
-            /* min and max */
-            FALSE, FALSE,
-            /* default value */
-            1
-          )
-        )
-      ),
-      'section5' => array (
-        'name' => _('SMTP privileged networks'),
-        'attrs' => array (
-          new StringAttribute (
-            _('Hosts/networks allowed to relay'),
-            _('Hosts/networks allowed to relay (multiple values comma-seperated)'),
-            'postfix-mynetworks',
-            FALSE,
-            '127.0.0.1/8'
-          )
-        )
-      ),
-      'section6' => array (
-        'name' => _('SMTP smarthost/relayhost'),
-        'attrs' => array (
-          new RelayHostKolabAttribute (
-            _('Host used to relay mails'), 'postfix-relayhost'
-          )
-        )
-      ),
-      'section7' => array (
-        'name' => _('Accept Internet Mail'),
-        'attrs' => array (
-          new BooleanAttribute (
-            _('Accept mail from other domains over non-authenticated SMTP'),
-            _('Accept mail from other domains over non-authenticated SMTP'),
-            'postfix-allow-unauthenticated'
-          )
-        )
-      )
-    );
-  }
-
-  function __construct ($dn = NULL, $parent = NULL)
-  {
-    global $config;
-    $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn);
-    $this->dn       = 'k=kolab,'.$config->current['BASE'];
-    parent::__construct($this->dn, $parent);
-
-    $this->attributesInfo['section1']['attrs']['k']->setVisible(FALSE);
-    $this->attributesInfo['section1']['attrs']['kolabHost']->setVisible(FALSE);
-
-    $this->is_account = in_array($this->hostname, $this->attributesInfo['section1']['attrs']['kolabHost']->getValue());
-
-    $this->initially_was_account = $this->is_account;
-
-    $this->updateAttributesValues();
-  }
-
-  function save ()
-  {
-    global $config;
-    $this->dn = 'k=kolab,'.$config->current['BASE'];
-
-    /* Check if this server was renamed, in this case we have to remove old cn first*/
-    $kolabHost = $this->attributesInfo['section1']['attrs']['kolabHost']->getValue();
-    if ($this->hostname != $this->cn) {
-      $key = array_search($this->hostname, $kolabHost);
-      if ($key !== FALSE) {
-        unset($kolabHost[$key]);
-      }
-    }
-    if (!in_array($this->cn, $kolabHost)) {
-      $kolabHost[] = $this->cn;
-    }
-    $this->attributesInfo['section1']['attrs']['kolabHost']->setValue($kolabHost);
-
-    parent::save();
-  }
-
-  function remove_from_parent()
-  {
-    global $config;
-    /* Only walk through following code, if this host was a member of the kolab hosts, else skip this */
-    if (!$this->initially_was_account) {
-      return;
-    }
-
-    /* !!! Don't use "cn" in this function
-       hostname -> the initial name of the host
-       cn       -> is the new name of the host, in case that it was renamed.
-     */
-    $ldap     = $config->get_ldap_link();
-    $this->dn = 'k=kolab,'.$config->current['BASE'];
-
-    /* We can't simply remove the whole entry, it is possible that there are
-       some other hosts assigned to this object.
-       So, first of all check if we are the last host entry within the host
-       : Remove k=kolab entry
-       if we aren't alone, only remove host name from hosts entry and save */
-    /* Are we alone? Remove complete entry... */
-
-    $kolabHost = $this->attributesInfo['section1']['attrs']['kolabHost']->getValue();
-
-    /* Check if we are definitly in kolabHosts */
-    if (!in_array_ics($this->hostname, $kolabHost)) {
-      return;
-    }
-
-    /* Integration check, not translated because they can't pop up at all, only for debug */
-    if (count($kolabHost) == 0) {
-      msg_dialog::display(_("Internal error"), _("Kolab account does not exist!"), ERROR_DIALOG);
-      return;
-    }
-    if (!isset($this->hostname) || (empty($this->hostname))) {
-      msg_dialog::display(_("Error"), msgPool::required(_("hostname")), ERROR_DIALOG);
-    }
-
-    /* Our hostname is in kolabHosts and there is a only one entry
-       = we are the last host entry, delete k=kolab entry  */
-    if (count($this->kolabHost) == 1) {
-      /* Remove complete entry */
-      $ldap->rmdir ($this->dn);
-      if (!$ldap->success()) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()), LDAP_ERROR);
-      }
-    } else {
-      /* Only modify kolabHost */
-      $key = array_search($this->hostname, $kolabHost);
-      unset($kolabHost[$key]);
-      $attrs = array('kolabHost' => array_values($kolabHost));
-      $ldap->cd($this->dn);
-      $this->cleanup();
-      $ldap->modify($attrs);
-      if (!$ldap->success()) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()), LDAP_ERROR);
-      }
-    }
-
-    logging::log('remove', 'service/'.get_class($this), $this->dn, array_keys($this->attrs), $ldap->get_error());
-
-    /* Optionally execute a command after we're done */
-    $this->handle_post_events("remove");
-  }
-
-}
-?>
diff --git a/kolab2/contrib/openldap/kolab2.schema b/kolab2/contrib/openldap/kolab2.schema
deleted file mode 100644
index fedb59ab39055c4370e545a05894a7391f944a04..0000000000000000000000000000000000000000
--- a/kolab2/contrib/openldap/kolab2.schema
+++ /dev/null
@@ -1,717 +0,0 @@
-# $Id: kolab2.schema,v 1.35 2009/02/09 15:32:37 thomas Exp $
-# (c) 2003, 2004 Tassilo Erlewein <tassilo.erlewein@erfrakon.de>
-# (c) 2003-2007  Martin Konold <martin.konold@erfrakon.de>
-# (c) 2003 Achim Frank <achim.frank@erfrakon.de>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# The name of the author may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This schema highly depends on the core.schema, cosine.schema and the inetorgperson.schema
-# as provided by 3rd parties like OpenLDAP.
-#
-# slapd.conf then looks like
-# include /kolab/etc/openldap/schema/core.schema
-# include /kolab/etc/openldap/schema/cosine.schema
-# include /kolab/etc/openldap/schema/inetorgperson.schema
-# include /kolab/etc/openldap/schema/rfc2739.schema
-# include /kolab/etc/openldap/schema/kolab2.schema
-
-#
-####################
-# kolab attributes #
-####################
-
-# helper attribute to make the kolab root easily findable in
-# a big ldap directory
-attributetype ( 1.3.6.1.4.1.19414.2.1.1
-  NAME ( 'k' 'kolab' )
-  DESC 'Kolab attribute'
-  SUP name )
-
-# kolabDeleteflag used to be a boolean but describes with Kolab 2
-# the fqdn of the server which is requested to delete this objects
-# in its local store
-attributetype ( 1.3.6.1.4.1.19414.2.1.2
-  NAME 'kolabDeleteflag'
-  DESC 'Per host deletion status'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# alias used to provide alternative rfc822 email addresses for kolab users
-attributetype ( 1.3.6.1.4.1.19414.2.1.3
-  NAME 'alias'
-  DESC 'RFC1274: RFC822 Mailbox'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the
-# cleartext password. This is required in order to pass the password from
-# the maintainance/administration application to the kolabHomeServer running the
-# resource handler application in a secure manner.
-# Actually this attribute is deprecated as of Kolab 2.1. Instead we grant the
-# calendar user dn: cn=calendar,cn=internal,dc=yourcompany,dc=com access to
-# the respective calendar folder using IMAP ACLs.
-attributetype ( 1.3.6.1.4.1.19419.2.1.4
-  NAME 'kolabEncryptedPassword'
-  DESC 'base64 encoded public key encrypted Password'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-# hostname including the domain name like kolab-master.yourcompany.com
-attributetype ( 1.3.6.1.4.1.19414.2.1.5
-  NAME ( 'fqhostname' 'fqdnhostname' )
-  DESC 'Fully qualified Hostname including full domain component'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# fqdn of all hosts in a multi-location or cluster setup
-attributetype ( 1.3.6.1.4.1.19414.2.1.6
-  NAME 'kolabHost'
-  DESC 'Multivalued -- list of hostnames in a Kolab setup'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# fqdn of the server containg the actual user mailbox
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.1
-  NAME 'kolabHomeServer'
-  DESC 'server which keeps the users mailbox'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# flag for allowing unrestriced length of mails
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.2
-  NAME 'unrestrictedMailSize'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# Specifies the email delegates.
-# An email delegate can send email on behalf of the account
-# which means using the "from" of the account.
-# Delegates are specified by the syntax of rfc822 email addresses.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.3
-  NAME 'kolabDelegate'
-  DESC 'Kolab user allowed to act as delegates - RFC822 Mailbox/Alias'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# For user, group and resource Kolab accounts
-# Describes how to respond to invitations
-# We keep the attribute as a string, but actually it can only have one
-# of the following values:
-#
-#  ACT_ALWAYS_ACCEPT
-#  ACT_ALWAYS_REJECT
-#  ACT_REJECT_IF_CONFLICTS
-#  ACT_MANUAL_IF_CONFLICTS
-#  ACT_MANUAL
-# In addition one of these values may be prefixed with a primary email
-# address followed by a colon like
-# user@domain.tld: ACT_ALWAYS_ACCEPT
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.4
-  NAME ( 'kolabInvitationPolicy' 'kolabResourceAction' )
-  DESC 'defines how to respond to invitations'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# time span from now to the future used for the free busy data
-# measured in days
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.5
-  NAME 'kolabFreeBusyFuture'
-  DESC 'time in days for fb data towards the future'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-  SINGLE-VALUE )
-
-# time span from now to the past used for the free busy data
-# measured in days
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.6
-  NAME 'kolabFreeBusyPast'
-  DESC 'time in days for fb data towards the past'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-  SINGLE-VALUE )
-
-# fqdn of the server as the default SMTP MTA
-# not used in Kolab 2 currently as in Kolab 2 the
-# default MTA is equivalent to the kolabHomeServer
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.7
-  NAME 'kolabHomeMTA'
-  DESC 'fqdn of default MTA'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-  SINGLE-VALUE )
-
-# Begin date of Kolab vacation period. Sender will
-# be notified every kolabVacationResendIntervall days
-# that recipient is absent until kolabVacationEnd.
-# Values in this syntax are encoded as printable strings,
-# represented as specified in X.208.
-# Note that the time zone must be specified.
-# For Kolab we limit ourself to  GMT
-# YYYYMMDDHHMMZ e.g. 200512311458Z.
-# see also: rfc 2252.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.8
-  NAME 'kolabVacationBeginDateTime'
-  DESC 'Begin date of vacation'
-  EQUALITY generalizedTimeMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-  SINGLE-VALUE )
-
-# End date of Kolab vacation period. Sender will
-# be notified every kolabVacationResendIntervall days
-# that recipient is absent starting from kolabVacationBeginDateTime.
-# Values in this syntax are encoded as printable strings,
-# represented as specified in X.208.
-# Note that the time zone must be specified.
-# For Kolab we limit ourself to  GMT
-# YYYYMMDDHHMMZ e.g. 200601012258Z.
-# see also: rfc 2252.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.9
-  NAME 'kolabVacationEndDateTime'
-  DESC 'End date of vacation'
-  EQUALITY generalizedTimeMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
-  SINGLE-VALUE )
-
-# Intervall in days after which senders get
-# another vacation message.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.10
-  NAME 'kolabVacationResendInterval'
-  DESC 'Vacation notice interval in days'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-  SINGLE-VALUE )
-
-# Email recipient addresses which are handled by the
-# vacation script. There can be multiple kolabVacationAddress
-# entries for each kolabInetOrgPerson.
-# Default is the primary email address and all
-# email aliases of the kolabInetOrgPerson.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.11
-  NAME 'kolabVacationAddress'
-  DESC 'Email address for vacation to response upon'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# Enable sending vacation notices in reaction
-# unsolicited commercial email.
-# Default is no.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.12
-  NAME 'kolabVacationReplyToUCE'
-  DESC 'Enable vacation notices to UCE'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-# Email recipient domains which are handled by the
-# vacation script. There can be multiple kolabVacationReactDomain
-# entries for each kolabInetOrgPerson
-# Default is to handle all domains.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.13
-  NAME 'kolabVacationReactDomain'
-  DESC 'Multivalued -- Email domain for vacation to response upon'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# Forward all incoming emails except UCE if kolabForwardUCE
-# is not set to this email address.
-# There can be multiple kolabForwardAddress entries for
-# each kolabInetOrgPerson.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.14
-  NAME 'kolabForwardAddress'
-  DESC 'Forward email to this address'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# Keep local copy when forwarding emails to list of
-# kolabForwardAddress.
-# Default is no.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.15
-  NAME 'kolabForwardKeepCopy'
-  DESC 'Keep copy when forwarding'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-# Enable forwarding of UCE.
-# Default is yes.
-# Currently this attribute is not used in Kolab.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.16
-  NAME 'kolabForwardUCE'
-  DESC 'Enable forwarding of mails known as UCE'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-# comment when creating or deleting a kolab object
-# a comment might be appropriate. This is most useful
-# for tracability when users get moved to the graveyard
-# instead of being really deleted. Every entry must be prefixed
-# with an ISO 8601 date string e.g 200604301458Z. All times must
-# be in zulu timezone.
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.17
-  NAME 'kolabComment'
-  DESC 'multi-value comment'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-
-# describes the allowed or disallowed smtp addresses for
-# recipients. If this attribute is not set for a user no
-# kolab recipient policy does apply.
-# example entries:
-# .tld             - allow mail to every recipient for this tld
-# domain.tld       - allow mail to everyone in domain.tld
-# .domain.tld      - allow mail to everyone in domain.tld and its subdomains
-# user@domain.tld  - allow mail to explicit user@domain.tld
-# user@            - allow mail to this user but any domain
-# -.tld            - disallow mail to every recipient for this tld
-# -domain.tld      - disallow mail to everyone in domain.tld
-# -.domain.tld     - disallow mail to everyone in domain.tld and its subdomains
-# -user@domain.tld - disallow mail to explicit user@domain.tld
-# -user@           - disallow mail to this user but any domain
-attributetype ( 1.3.6.1.4.1.19419.1.1.1.18
-  NAME 'kolabAllowSMTPRecipient'
-  DESC 'SMTP address allowed for destination (multi-valued)'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{512} )
-
-# Create the user mailbox on the kolabHomeServer only.
-# Default is no.
-attributetype ( 1.3.6.1.4.1.19414.1.1.1.19
-  NAME 'kolabHomeServerOnly'
-  DESC 'Create the user mailbox on the kolabHomeServer only'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-# kolabFolderType describes the kind of Kolab folder
-# as defined in the kolab format specification.
-# We will annotate all folders with an entry
-# /vendor/kolab/folder-type containing the attribute
-# value.shared set to: <type>[.<subtype>].
-# The <type> can be: mail, event, journal, task, note,
-# or contact. The <subtype> for a mail folder can be
-# inbox, drafts, sentitems, or junkemail (this one holds
-# spam mails). For the other <type>s, it can only be
-# default, or not set.  For other types of folders
-# supported by the clients, these should be prefixed with
-# "k-" for KMail, "h-" for Horde and "o-" for Outlook, and
-# look like for example "kolab.o-voicemail". Other third-party
-# clients shall use the "x-" prefix.
-# We then use the ANNOTATEMORE IMAP extension to
-# associate the folder type with a folder.
-attributetype ( 1.3.6.1.4.1.19414.2.1.7
-  NAME 'kolabFolderType'
-  DESC 'type of a kolab folder'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256}
-  SINGLE-VALUE )
-
-######################
-# postfix attributes #
-######################
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.501
-  NAME 'postfix-mydomain'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.502
-  NAME 'postfix-relaydomains'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.503
-  NAME 'postfix-mydestination'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.504
-  NAME 'postfix-mynetworks'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.505
-  NAME 'postfix-relayhost'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.506
-  NAME 'postfix-transport'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.507
-  NAME 'postfix-enable-virus-scan'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.508
-  NAME 'postfix-allow-unauthenticated'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.509
-  NAME 'postfix-virtual'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.510
-  NAME 'postfix-relayport'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.511
-  NAME 'postfix-message-size-limit'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-##########################
-# cyrus imapd attributes #
-##########################
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.601
-  NAME 'cyrus-autocreatequota'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
-  SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.602
-  NAME 'cyrus-admins'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
-
-# enable plain imap without ssl
-attributetype ( 1.3.6.1.4.1.19414.2.1.603
-  NAME 'cyrus-imap'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE )
-
-# enable legacy pop3
-attributetype ( 1.3.6.1.4.1.19414.2.1.604
-  NAME 'cyrus-pop3'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# user specific quota on the cyrus imap server
-attributetype ( 1.3.6.1.4.1.19414.2.1.605
-  NAME 'cyrus-userquota'
-  DESC 'Mailbox hard quota limit in MB'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-# enable secure imap
-attributetype ( 1.3.6.1.4.1.19414.2.1.606
-  NAME 'cyrus-imaps'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# enable secure pop3
-attributetype ( 1.3.6.1.4.1.19414.2.1.607
-  NAME 'cyrus-pop3s'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# enable sieve support (required for forward and vacation services)
-attributetype ( 1.3.6.1.4.1.19414.2.1.608
-  NAME 'cyrus-sieve'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# installation wide percentage which determines when to send a
-# warning to the user
-attributetype ( 1.3.6.1.4.1.19414.2.1.609
-  NAME 'cyrus-quotawarn'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-# enable smmap support
-attributetype ( 1.3.6.1.4.1.19414.2.1.610
-  NAME 'cyrus-smmap'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# enable fulldirhash support
-attributetype ( 1.3.6.1.4.1.19414.2.1.611
-  NAME 'cyrus-fulldirhash'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# enable hashimapspool support
-attributetype ( 1.3.6.1.4.1.19414.2.1.612
-  NAME 'cyrus-hashimapspool'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# enable squatter support
-attributetype ( 1.3.6.1.4.1.19414.2.1.613
-  NAME 'cyrus-squatter'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-
-#############################
-# apache and php attributes #
-#############################
-
-# enable plain http (no ssl)
-attributetype ( 1.3.6.1.4.1.19414.2.1.701
-  NAME 'apache-http'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# Allow freebusy download without authenticating first
-attributetype ( 1.3.6.1.4.1.19414.2.1.702
-  NAME 'apache-allow-unauthenticated-fb'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-##########################
-# kolabfilter attributes #
-##########################
-
-# enable trustable From:
-attributetype ( 1.3.6.1.4.1.19414.2.1.750
-  NAME 'kolabfilter-verify-from-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# should Sender header be allowed instead of From
-# when present?
-attributetype ( 1.3.6.1.4.1.19414.2.1.751
-  NAME 'kolabfilter-allow-sender-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# Should reject messages with From headers that dont match
-# the envelope? Default is to rewrite the header
-attributetype ( 1.3.6.1.4.1.19414.2.1.752
-  NAME 'kolabfilter-reject-forged-from-header'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-# Enable the Kolab Policy Daemon. If false or not
-# set don't use the Kolab Policy Daemon
-attributetype ( 1.3.6.1.4.1.19414.2.1.800
-  NAME 'kolabPolicyDaemon'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-######################################################
-# proftpd attributes (unused since Kolab Server 2.2) #
-######################################################
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.901
-  NAME 'proftpd-defaultquota'
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.902
-  NAME 'proftpd-ftp'
-  EQUALITY booleanMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
-attributetype ( 1.3.6.1.4.1.19414.2.1.903
-  NAME 'proftpd-userPassword'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-########################
-# kolab object classes #
-########################
-
-# main kolab server configuration
-# storing global values and user specific default values
-# like kolabFreeBusyFuture and kolabFreeBusyPast
-objectclass ( 1.3.6.1.4.1.19414.2.2.1
-  NAME 'kolab'
-  DESC 'Kolab server configuration'
-  SUP top STRUCTURAL
-  MUST k
-  MAY ( kolabHost $
-        postfix-mydomain $
-        postfix-relaydomains $
-        postfix-mydestination $
-        postfix-mynetworks $
-        postfix-relayhost $
-        postfix-relayport $
-        postfix-transport $
-        postfix-virtual $
-        postfix-enable-virus-scan $
-        postfix-allow-unauthenticated $
-        postfix-message-size-limit $
-        cyrus-quotawarn $
-        cyrus-autocreatequota $
-        cyrus-admins $
-        cyrus-imap $
-        cyrus-pop3 $
-        cyrus-imaps $
-        cyrus-pop3s $
-        cyrus-sieve $
-        cyrus-smmap $
-        cyrus-fulldirhash $
-        cyrus-hashimapspool $
-        cyrus-squatter $
-        apache-http $
-        apache-allow-unauthenticated-fb $
-        kolabfilter-verify-from-header $
-        kolabfilter-allow-sender-header $
-        kolabfilter-reject-forged-from-header $
-        kolabPolicyDaemon $
-        proftpd-ftp $
-        proftpd-defaultquota $
-        kolabFreeBusyFuture $
-        kolabFreeBusyPast $
-        uid $
-        userPassword ) )
-
-# public folders are typically visible to everyone subscribed to
-# the server without the need for an extra login. Subfolders are
-# defined using the hiarchy seperator '/' e.g. "sf/sub1". Please note
-# that the term public folder is prefered to shared folder because
-# normal user mailboxes can also share folders using acls.
-objectclass ( 1.3.6.1.4.1.19414.2.2.9
-  NAME 'kolabSharedFolder'
-  DESC 'Kolab public shared folder'
-  SUP top AUXILIARY
-  MUST cn
-  MAY ( alias $
-        fdCyrusAcl $
-        cyrus-userquota $
-        kolabHomeServer $
-        kolabFolderType $
-        kolabDeleteflag ) )
-
-# kolabNamedObject is used as a plain node for the LDAP tree.
-# In contrast to unix filesystem directories LDAP nodes can
-# and often do also have contents/attributes. We use the
-# kolabNamedObject in order to put some structure in the
-# LDAP directory tree.
-objectclass ( 1.3.6.1.4.1.5322.13.1.1
-  NAME 'kolabNamedObject'
-  SUP top STRUCTURAL
-  MAY (cn $ ou) )
-
-# kolab account
-# we use an auxiliary in order to ease integration
-# with existing inetOrgPerson objects
-# Please note that userPassword is a may
-# attribute in the schema but is mandatory for
-# Kolab
-objectclass ( 1.3.6.1.4.1.19414.3.2.2
-  NAME 'kolabInetOrgPerson'
-  DESC 'Kolab Internet Organizational Person'
-  SUP top AUXILIARY
-  MAY ( c $
-        alias $
-        kolabHomeServer $
-        kolabHomeServerOnly $
-        kolabHomeMTA $
-        unrestrictedMailSize $
-        kolabDelegate $
-        kolabEncryptedPassword $
-        cyrus-userquota $
-        kolabInvitationPolicy $
-        kolabFreeBusyFuture $
-        calFBURL $
-        kolabVacationBeginDateTime $
-        kolabVacationEndDateTime $
-        kolabVacationResendInterval $
-        kolabVacationAddress $
-        kolabVacationReplyToUCE $
-        kolabVacationReactDomain $
-        kolabForwardAddress $
-        kolabForwardKeepCopy $
-        kolabForwardUCE $
-        kolabAllowSMTPRecipient $
-        kolabDeleteflag $
-        kolabComment ) )
-
-# kolab organization with country support
-objectclass ( 1.3.6.1.4.1.19414.3.2.3
-  NAME 'kolabOrganization'
-  DESC 'RFC2256: a Kolab organization'
-  SUP organization STRUCTURAL
-  MAY ( c $
-        mail $
-        kolabDeleteflag $
-        alias ) )
-
-# kolab organizational unit with country support
-objectclass ( 1.3.6.1.4.1.19414.3.2.4
-  NAME 'kolabOrganizationalUnit'
-  DESC 'a Kolab organizational unit'
-  SUP organizationalUnit STRUCTURAL
-  MAY ( c $
-        mail $
-        kolabDeleteflag $
-        alias ) )
-
-# kolab groupOfNames with extra kolabDeleteflag and the required
-# attribute mail.
-# The mail attribute for kolab objects of the type kolabGroupOfNames
-# is not arbitrary but MUST be a single attribute of the form
-# of an valid SMTP address with the CN as the local part.
-# E.g cn@kolabdomain (e.g. employees@mydomain.com). The
-# mail attribute MUST be globally unique.
-objectclass ( 1.3.6.1.4.1.19414.3.2.5
-  NAME 'kolabGroupOfNames'
-  DESC 'Kolab group of names (DNs) derived from RFC2256'
-  SUP top AUXILIARY
-  MAY ( mail $
-        kolabDeleteflag $
-        member ) )
diff --git a/kolab2/contrib/openldap/rfc2739.schema b/kolab2/contrib/openldap/rfc2739.schema
deleted file mode 100644
index 668628e960033954fda050a75026887bb7a0a26b..0000000000000000000000000000000000000000
--- a/kolab2/contrib/openldap/rfc2739.schema
+++ /dev/null
@@ -1,134 +0,0 @@
-# (c) 2004 Martin Konold <martin.konold@erfrakon.de>
-
-# This schema is derived from RFC 2739 and may act as a substitute
-# when used with OpenLDAP as the original schema from RFC 2739 
-# is syntactically not accepted by OpenLDAP 2.2.14
-#
-# Copyright (C) The Internet Society (2000).  All Rights Reserved.
-#
-#  This document and translations of it may be copied and furnished to
-#  others, and derivative works that comment on or otherwise explain it
-#  or assist in its implementation may be prepared, copied, published
-#  and distributed, in whole or in part, without restriction of any
-#  kind, provided that the above copyright notice and this paragraph are
-#  included on all such copies and derivative works.  However, this
-#  document itself may not be modified in any way, such as by removing
-#  the copyright notice or references to the Internet Society or other
-#  Internet organizations, except as needed for the purpose of
-#  developing Internet standards in which case the procedures for
-#  copyrights defined in the Internet Standards process must be
-#  followed, or as required to translate it into languages other than
-#  English.
-#
-#  The limited permissions granted above are perpetual and will not be
-#  revoked by the Internet Society or its successors or assigns.
-#
-#  This document and the information contained herein is provided on an
-#  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-#  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-#  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-#  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-# slapd.conf then looks like
-#  include /kolab/etc/openldap/schema/core.schema
-#  include /kolab/etc/openldap/schema/cosine.schema
-#  include /kolab/local/etc/openldap/schema/inetorgperson.schema
-#  include /kolab/local/etc/openldap/schema/rfc2739.schema
-#  include /kolab/local/etc/openldap/schema/kolab2.schema
-
-#
-################################
-# rfc 2739 calendar attributes #
-################################
-
-# contains the URI to a snapshot of the user's entire
-# default calendar
-attributetype ( 1.2.840.113556.1.4.478
-  NAME 'calCalURI'
-  DESC 'RFC2739: URI of entire default calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains the URI to the user's default
-# busy time data
-attributetype (1.2.840.113556.1.4.479
-  NAME 'calFBURL'
-  DESC 'RFC2739: URI to the users default freebusy data'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains a URI that can be used to communicate with 
-# the user's calendar
-attributetype (1.2.840.113556.1.4.480
-  NAME 'calCAPURI'
-  DESC 'RFC2739: URI used to communicate with the users calendar'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# contains a URI that points to the location to which event
-# requests should be sent for that user
-attributetype (1.2.840.113556.1.4.481
-  NAME 'calCalAdrURI'
-  DESC 'RFC2739: URI for event equests destination'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URIs to snapshots of 
-# other calendars that the user may have
-attributetype (1.2.840.113556.1.4.482
-  NAME 'calOtherCalURIs'
-  DESC 'RFC2739: multi-value URI for snapshots of other calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URIs to snapshots of other 
-# free/busy data that the user may have
-attributetype (1.2.840.113556.1.4.483
-  NAME 'calOtherFBURLs'
-  DESC 'RFC2739: multi-value URI for other free/busy data'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-# multi-valued property containing URI to other calendars that
-# the user may have
-attributetype (1.2.840.113556.1.4.484
-  NAME 'calOtherCAPURIs'
-  DESC 'RFC2739: multi-value URI to other calendars'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-#  URIs to other locations that a user may want
-#   event requests sent to
-attributetype (1.2.840.113556.1.4.485
-  NAME 'calOtherCalAdrURIs'
-  DESC 'RFC2739: multi-value URI to other request destinations'
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  USAGE userApplications )
-
-objectclass (1.2.840.113556.1.5.87
-  NAME 'calEntry'
-  DESC 'RFC2739: Calendar Entry'
-  SUP top AUXILIARY
-  MAY ( calCalURI $ 
-        calFBURL $
-        calOtherCalURIs $
-        calOtherFBURLs $
-        calCAPURI $
-        calOtherCAPURIs ) )
diff --git a/kolab2/html/themes/breezy/icons/16/apps/kolab2.png b/kolab2/html/themes/breezy/icons/16/apps/kolab2.png
deleted file mode 100644
index 9200f578fa44659ceb06becbc0459d779b0f5993..0000000000000000000000000000000000000000
Binary files a/kolab2/html/themes/breezy/icons/16/apps/kolab2.png and /dev/null differ
diff --git a/kolab2/html/themes/breezy/icons/48/apps/kolab2.png b/kolab2/html/themes/breezy/icons/48/apps/kolab2.png
deleted file mode 100644
index e2196acf25e458990b82b1725409f27222472e3a..0000000000000000000000000000000000000000
Binary files a/kolab2/html/themes/breezy/icons/48/apps/kolab2.png and /dev/null differ
diff --git a/kolab2/html/themes/breezy/svg/16/apps/kolab2.svg b/kolab2/html/themes/breezy/svg/16/apps/kolab2.svg
deleted file mode 100644
index fdfaea18debf65edc101feb521d219b562d927ea..0000000000000000000000000000000000000000
--- a/kolab2/html/themes/breezy/svg/16/apps/kolab2.svg
+++ /dev/null
@@ -1,477 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3049"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="kolab2.svg"
-   inkscape:export-filename="kolab2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   viewBox="0 0 16 16">
-  <defs
-     id="defs3051">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-      .ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }
-      </style>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="1.9855908"
-     inkscape:cy="6.3456936"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1880"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4085" />
-    <sodipodi:guide
-       position="2.0000044,14.00003"
-       orientation="12,0"
-       id="guide4075" />
-    <sodipodi:guide
-       position="2.0000044,2.0000296"
-       orientation="0,12"
-       id="guide4077" />
-    <sodipodi:guide
-       position="14.000004,2.0000296"
-       orientation="-12,0"
-       id="guide4079" />
-    <sodipodi:guide
-       position="14.000004,14.00003"
-       orientation="0,-12"
-       id="guide4081" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3054">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-421.71429,-531.79074)">
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5"
-       width="0"
-       height="10.999983"
-       x="-446.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-8"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-59"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781"
-       y="559.42297"
-       x="-449.12207"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783"
-         sodipodi:role="line"
-         x="-449.12207"
-         y="559.42297" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-8"
-       y="553.55963"
-       x="-448.38538"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-1"
-         sodipodi:role="line"
-         x="-448.38538"
-         y="553.55963" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-4"
-       y="560.42297"
-       x="-455.12207"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-13"
-         sodipodi:role="line"
-         x="-455.12207"
-         y="560.42297" /></text>
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7"
-       width="0"
-       height="10.999983"
-       x="-446.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9-0"
-       width="0"
-       height="10.999983"
-       x="-484.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7-5"
-       width="0"
-       height="10.999983"
-       x="-466.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-3"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-4"
-       width="0"
-       height="10.999983"
-       x="-446.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-8-7"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-59-1"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-1"
-       y="559.42297"
-       x="-449.12207"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-8"
-         sodipodi:role="line"
-         x="-449.12207"
-         y="559.42297" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-8-2"
-       y="553.55963"
-       x="-448.38538"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-1-6"
-         sodipodi:role="line"
-         x="-448.38538"
-         y="553.55963" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-4-7"
-       y="560.42297"
-       x="-455.12207"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-13-8"
-         sodipodi:role="line"
-         x="-455.12207"
-         y="560.42297" /></text>
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9-08"
-       width="0"
-       height="10.999983"
-       x="-464.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7-8"
-       width="0"
-       height="10.999983"
-       x="-446.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9-0-2"
-       width="0"
-       height="10.999983"
-       x="-484.55804"
-       y="546.66571"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7-5-2"
-       width="0"
-       height="10.999983"
-       x="-466.51727"
-       y="544.61438"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-2"
-       width="0"
-       height="10.999983"
-       x="-468.79242"
-       y="548.64069"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-0"
-       width="0"
-       height="10.999983"
-       x="-450.75165"
-       y="546.58936"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-8-1"
-       width="0"
-       height="10.999983"
-       x="-468.79242"
-       y="548.64069"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-59-7"
-       width="0"
-       height="10.999983"
-       x="-468.79242"
-       y="548.64069"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-41"
-       y="561.39795"
-       x="-453.35645"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-9"
-         sodipodi:role="line"
-         x="-453.35645"
-         y="561.39795" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-8-7"
-       y="555.53461"
-       x="-452.61975"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-1-2"
-         sodipodi:role="line"
-         x="-452.61975"
-         y="555.53461" /></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3781-4-3"
-       y="562.39795"
-       x="-459.35645"
-       style="font-style:normal;font-weight:normal;font-size:9px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:currentColor;fill-opacity:1;stroke:none"
-       xml:space="preserve"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text"><tspan
-         id="tspan3783-13-6"
-         sodipodi:role="line"
-         x="-459.35645"
-         y="562.39795" /></text>
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9-9"
-       width="0"
-       height="10.999983"
-       x="-468.79242"
-       y="548.64069"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7-9"
-       width="0"
-       height="10.999983"
-       x="-450.75165"
-       y="546.58936"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-9-0-5"
-       width="0"
-       height="10.999983"
-       x="-488.79242"
-       y="548.64069"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="fill:currentColor;fill-opacity:1;stroke:none"
-       id="rect4035-5-7-5-3"
-       width="0"
-       height="10.999983"
-       x="-470.75165"
-       y="546.58936"
-       transform="scale(-1,1)"
-       class="ColorScheme-Text" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4188"
-       width="16"
-       height="16"
-       x="421.71429"
-       y="531.79071"
-       ry="5.0000296" />
-    <image
-       style="display:inline"
-       y="532.79071"
-       x="422.71429"
-       id="image4190"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAO YUlEQVRoge1Za5Ac1XX++jnd0zPTPc+dmd3Z1Uq7K8kWsrQCDAEksAJEwrFCXFAOcUh+JEUqiewQ IQIJYkuQwkaVHxFQ2AJDHhS2kw0lkIMLCMS8XzICCSGvXqt9z3t6nt09/cyP0Q47OyMiBMKVKn// +tx7zz3fPfeee+5p4Df49YL4vBSNjIywiUTCNf89PT2t7ty50/y89J8Jn5nAEz996qJQV3QLxwub PF7vMEmSsEwTuUzmFwfeeucP77rrb5Kfh6FnwjkT+Mno3itjPX13RLoT1/pEPyiKamm3LBMfHXj7 yfcPvPvA8LrLNjnAZo8kAQBq5VItNTH5vZtvvvG/P5v550Bgz2OPXb7yggvv6e7tv5wXPAxBdFZh miZmZ5OwTV3vW9LPkiTZbHMcB+WibI4f/eg7m69e/4NzNx+g/u8uH2N0dO+VF1x42dO9SwdXsi4X dSbjLcvCbDILXzAGByQl8C4sJEAQBDieJ3m3cN3FF1849/RT/3ngvBPYs2cPE+sf+PGSwZUDC42Z h2mayGYzcBwHqqpAMwm43R44DqCrFbjd7rYxHO8GzbiuGRgcePHFF56bORcC7ZacARznj/X0DXx1 sfGGoSOdyaKsaJBCUTCcgGQ6C8d2AACsi0OpXIVclJGTZeRlGZlsFqbZCFC9/ctcl1y2/snvf3+P eC4E6LPtaJPWTVIg2CJzHAdysQyfP9jcIgRJgiBIOI7d+CYI0JwHhk1APH2IbdtGvlhAQBTBMAyW DKxYWikWbwLwqc9DG4GRkRE6kVjLh0KN7+PHj9vbt2+vgWzfbYVCAV4pgMVeWfztkwKoFHNwHAcE QYAkSYj+IPL5LLrCYbhcHCLxnh0jIyOPAkBi7VreyOQ3kRS9NDOXfPXQoffeGR0dtT6RwMjICDl8 6ZWbvT7xb6VA8HKKbjRJ0SWl/3rhlWfSc9OrLMtqCZeGYbYZCwAURYFYdGgFXwByQYYoiY12goDH J6FcLkMURYj+UGzFqjW/CMcSCESilwfWR8AwDHLpFJauWP690dHRv+tEgACAxx//SSLcHX1ixerh DYLHi8XRxbZtTJ06Cd204Q8EQJEkfKIP5ZoGweNtU5rPZSHLZfT0LWuRm6aBWllGOBJqEs9n0lCV GlyChFo5j8HBwTZ92dScfOz4weU3bt6cbVus3bt3h1esGX75S2suWsfxfJvx8yvIcjzSORlSuAea YWMumQZJUdBUBQzDwrJMWFbDIyRJYXpqCpFovEUPSVKolEuolovwiSIcx4GiauA8frg4N7KpGURj sbb5Od7NO7p5cTwSOPjqq6+mWnT6w/Fv9w+uHKLpzudZVRTUagqqtRpIwkEmnUJV1QHOB9UAaJcH imaiWKqhWKwinyuiWq2CJDvfEVIgBLmQAwAU8gVwggSOb4RYy+q4zUFRFBLLhjYsv2DtpsVtpOCT trg4rm2Q4zjIZDLQTBsE44IYCCPc1YViuQzG7YNXCoIVJMymMlBVFT7RD58UhEcMgKQ5eL2+jgYx DAtNraOQz4GkOcwvnOPYAEFCVZSOJAACSrW6ZbGUDgQCGzoZn83lIIgBLPQMTTPQVAU0wzRWhqYR jvdCUxVUKhV4vY3zwLs9cEBAqVbgFaU2U2I9vdB0B5peRr5cA0CgkE1CEv2YTuXBMSVIogCfz7fA fIAg2gMGaZpGm1BVFLC8gE7birBNpGdOwXGcpozj3VAMG5qmNfoQBLw+CZraeTV1XQcBAiTtgj8Y gT8YRiAYhhQIIRxPwKZYTE/PtszhADDt9uycLBfl99oI1Ovg+farHwC64t3wCW6kZ061bBHe40Ox WoN9Wub2eKFpnQmUigUQJAmGbT4foCo18IIHAOARJdQNs0W/Y9ugCOJf2ggYRv2thUwBQFW1jhMT BIm6qiDcFYVf9CI7OwFD10+3EWDdXpSrFQAAy7pg6DoMQ2/TU69rgOM0PWSaBmzLaEbA+XukhYDj wFCVahuB2empo9VKeZG0c4rE8Tw4V2PVAsEwwqEgMjPj0DUVQOOA6haaro/19GF26lSLDk1TEY31 gOPdqGs1AICcTSEUibT0oymqJZKVigXUapU2m0jH1F+Uc5kWoWPbHQnQNA1Dr8M+3e4TJfT0JJBL TkLOpmHbNizn43DIuwVwHIeSnIfjOHAcB7nULOpqDS6Og62rqJZLsMw6vKK/OY+h66hVq5idmUUq lUYymUImk8GG3/m9PU/97IUfPfrofwTm+1IDAwNaOBz5enff0q55FxqmCRfHdyRhWya0er0ZuxmW hegTodZKKMkFeEQ/KnKuGZE4t4DU7AQY1oVatQIXZcMruKHUdUj+IFLTEwhHY+D4xnyO4yA9NwNJ kuARQ+AEEUW5gFAwgGhPLxPt6Rt2e7irrvnapmdGR59UqP379+tXfW1Dvbd/cAt7enuoigKG5Tre yrzbjUxyGiCoJkmSouDx+kBTJLLJadRKMiR/EBRNw7YdyOlpnDi0H4XUBATeBcvQkZybha7riIZE lOQCdMsGTdNITk3C6/EgFImiUi4iNT2OYEBEKBJpJoJe0d/NcK4rNl+95SkKAJYPDZVsy/xGon/Q T5IkWJZFsVRqrspCEAQBSfJDzqVQq9UgeHxNuYvjEAyFQTgGONKEUi5gfOwDHH3/jQcnTx3feMf2 bX//r48/ujMoeebMmvy8oZQllqE9DGHzk0cP50589H7GzXOSoWvIp6fh5mkMDg7C6/O1LGYjERR7 CMpONKX333//4OqLLntx9bpLekmKQrlchukQHZM1oLHPT4wdAcN7EYn3tmSlhdQUBpb0AgDeevWl qbFD+9fceeedcic9d9xxxxDP84lcLjexYtXawIZrv/6uPxhutiuKApIkYdt226tu6tSJ1kf9ww8/ vHxw1brnVn5l3RKSJBsk7EZMX2igYRhQKiWIXg+SqSSyhRJ6l60EezqunzryPobXrsH4sTH9rZd/ vvm22257qeMqLMKex5+46PKNm971SX6UyhXUFB0O2diqWq2KnliwxY7ZyfHWN/Gzzz6b/9LQsp+p Sm1LVzwhCR4PaIqAUq2iXJShqgqMugaKcBAI+EHTNCTJD6+bx/T4cciFPGzTBOXoyKXnSoffe/ub 3/3u1rMunVz721cP82LoJt1hQLICOMELF8eDohmwHI9sOgOPwDdJTJ4cS3dMGe+5557lfcuGHlg1 /NVr4oklZzW5ZVmoVMr4cP+bJyeOjz3PMNQDt95661EA2Lt3byLcO7iN5YRLHdtCLjVXc0zjn48e +eDotm3b3gWAffv2uflw/yTBiaGuWPfp1JxqeUBZlgWlnEd3NIRSIYfXXti39Yx1oRtuuIFavXr1 n8a6+3asGr44GOtdwrELrv7FqGsqDrz9mvzLN1+77b77/uHxefmeH/3bty6+4qqd4a7YkFavo1xV oWo6GJpEKZfSoVfvqhn8k+XcyVsuuOJ3764oKiyHAutyoVouwcWQ8EtSS9ZazMzhxMHXD84dPrjx rApbu3btuiwYid6Z6B+6Lt67BIFQpBkVapUyZibHcfTwB/+TSc78yY4dO6bnxz30g0f+7NIrr3kk 1tOHTDYPi+LA8cLHpFUFpqHBdgDbqEOQwiiWyqgqChzbRrCrGwRBQKkU4XVzzUN8cuwQpn/19vV/ ecstT591ZW5kZIRkWXbIxfM3ROOJCEnSsG0T1WIJ2WzyGdM0X15czH374PEjvUsHVspyEQbJgWEb 745qpQLLNuH1+lAuyhD9AVSrVeTyBUihLjAsh5KcQzY1A38wAikYQb1WhYsGcpk5SDwNOTV795br Nt571mWVnTt32gDGANx7Nv3/6aEfbpSCwZW2bUG3KTAuFwqFAlTThlcKwDYtTExMALoCKRACRdEg HAeObTfumkAYUiAMOZ+BnE1CzibBUzaGBpYhFArjw2ppPfApClufFh5BAEmSME0TBEmiXtdgUS74 /CEQBAmjrkDgaEjBRhLndrsRjXYhPzfRzLUAQAqE4RHcWL1mHbxeL8LhxvadrzudtQc+LaqlEmzL xnz9uJBNwyEZGJoClmUAtYRwOAKHYJpjON6NUDiM5MQYon1DIECgVsrDL3lBURTcHh80TW1kCvlG geK8eYCmAYJo1Ex13UAoEoWpVmApRSj5JFgKsEwTptX6yvIHI2Bg4Nh7r2DiyH74BK5ZR6JdAorF IrLpJI6NHXkJOI8eMM1GZkmQFFxuATTNINE/iLmpk/AIPKLRGDKZLOqmg3CsB3q9DtblQqVURDza heVDgyiXS8glJ8ByPHTDQKkoo5ScPKkrlX80dfWn55VAPB55+eD+t17zBruuYD1BMAyNSjGHeLwb wWCjsOXzCpiZTUJTaigWcojEEyjlU1ixfAA0TZ8+F406kW3bmD51AhOH3vzj22+//Y35ec4bgRtv vNECsP6Hjzz27Lorrt0cCIbA9iVa+vhECXHbQTI1BUVVUVfK6OmOdS4mEAQyc9PHZ2dnP1ooP29n YB5SsGs8Gu/G/Fujrd3vRyQcRC07hURPFMH5qvIilOQCpsaPPbR79+7iQvl588A8TMuUdb2OT0pD qiUZJ3516BuVYv7CpStWb1+6/Ms8vyB11vU63nnlhcnv/NVfPLB47Kf6xXQuGP7KRceUSuHbXfFe Yb4gthiT48df//DAuyN377jrxaW9fc9XS4WpXCa9wjTq3lxqDoffe+d1OZv7o+ee+3l68djP7T/x J+G+++4L9g9++dE1l2y4XvC2vq5M08Rrz+/795tv+ua3Fo4ZGRkJuN1uDgBmZmbyDz74YL2T7i+E wGmD6HhiyWOrhn/r9+N9/R6aZuA4Dk4e+0g9/M4b67du/fNfnoveL4zAPHbt2nV9z9IVf0DRzA26 po1lZifv3bbtr3/8RdvxWUFs377du3Xr1jOf7N/g/wn+F80bIwhmCtLUAAAAAElFTkSuQmCC "
-       preserveAspectRatio="none"
-       height="14"
-       width="14" />
-  </g>
-</svg>
diff --git a/kolab2/html/themes/breezy/svg/48/apps/kolab2.svg b/kolab2/html/themes/breezy/svg/48/apps/kolab2.svg
deleted file mode 100644
index e3127b3e15c1a957f8634722981f3c2f61736cd7..0000000000000000000000000000000000000000
--- a/kolab2/html/themes/breezy/svg/48/apps/kolab2.svg
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg5453"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="kolab2.svg"
-   inkscape:export-filename="kolab2.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs5455">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4227">
-      <stop
-         style="stop-color:#292c2f;stop-opacity:1"
-         offset="0"
-         id="stop4229" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4231" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-5.8399973e-6,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="517.79797"
-       x2="400.57144"
-       y1="545.79797"
-       x1="400.57144"
-       id="linearGradient4238"
-       xlink:href="#linearGradient4303"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4303">
-      <stop
-         style="stop-color:#c6cdd1;stop-opacity:1"
-         offset="0"
-         id="stop4305" />
-      <stop
-         style="stop-color:#e0e5e7;stop-opacity:1"
-         offset="1"
-         id="stop4307" />
-    </linearGradient>
-    <style
-       id="current-color-scheme"
-       type="text/css">
-      .ColorScheme-Text {
-        color:#4d4d4d;
-      }
-      .ColorScheme-Background {
-        color:#eff0f1;
-      }
-      .ColorScheme-Highlight {
-        color:#3daee9;
-      }
-      .ColorScheme-ViewText {
-        color:#31363b;
-      }
-      .ColorScheme-ViewBackground {
-        color:#fcfcfc;
-      }
-      .ColorScheme-ViewHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ViewFocus{
-        color:#3daee9;
-      }
-      .ColorScheme-ButtonText {
-        color:#31363b;
-      }
-      .ColorScheme-ButtonBackground {
-        color:#eff0f1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#93cee9;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#3daee9;
-      }
-      </style>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4227"
-       id="linearGradient4277"
-       x1="421.31427"
-       y1="530.79071"
-       x2="436.91431"
-       y2="546.39075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6666661,0,0,1.6666661,-692.19027,-875.65089)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="0.080509679"
-     inkscape:cy="11.748455"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1-9"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1880"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     showguides="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4063" />
-    <sodipodi:guide
-       position="1.1650391e-05,47.999996"
-       orientation="4,0"
-       id="guide4146" />
-    <sodipodi:guide
-       position="1.1650391e-05,43.999996"
-       orientation="0,48"
-       id="guide4148" />
-    <sodipodi:guide
-       position="48.000012,43.999996"
-       orientation="-4,0"
-       id="guide4150" />
-    <sodipodi:guide
-       position="48.000012,47.999996"
-       orientation="0,-48"
-       id="guide4152" />
-    <sodipodi:guide
-       position="1.1650391e-05,4.0000264"
-       orientation="4,0"
-       id="guide4154" />
-    <sodipodi:guide
-       position="1.1650391e-05,2.6367188e-05"
-       orientation="0,48"
-       id="guide4156" />
-    <sodipodi:guide
-       position="48.000012,2.6367188e-05"
-       orientation="-4,0"
-       id="guide4158" />
-    <sodipodi:guide
-       position="48.000012,4.0000264"
-       orientation="0,-48"
-       id="guide4160" />
-    <sodipodi:guide
-       position="48.000012,48.000026"
-       orientation="0,-4"
-       id="guide4162" />
-    <sodipodi:guide
-       position="44.000012,48.000026"
-       orientation="48,0"
-       id="guide4164" />
-    <sodipodi:guide
-       position="44.000012,2.6367188e-05"
-       orientation="0,4"
-       id="guide4166" />
-    <sodipodi:guide
-       position="48.000012,2.6367188e-05"
-       orientation="-48,0"
-       id="guide4168" />
-    <sodipodi:guide
-       position="4.0000422,48.000026"
-       orientation="0,-4"
-       id="guide4170" />
-    <sodipodi:guide
-       position="4.2167969e-05,48.000026"
-       orientation="48,0"
-       id="guide4172" />
-    <sodipodi:guide
-       position="4.2167969e-05,2.6367188e-05"
-       orientation="0,4"
-       id="guide4174" />
-    <sodipodi:guide
-       position="4.0000422,2.6367188e-05"
-       orientation="-48,0"
-       id="guide4176" />
-    <sodipodi:guide
-       position="20.000012,43.999996"
-       orientation="39.999969,0"
-       id="guide4153" />
-    <sodipodi:guide
-       position="20.000012,4.0000264"
-       orientation="0,8"
-       id="guide4155" />
-    <sodipodi:guide
-       position="28.000012,4.0000264"
-       orientation="-39.999969,0"
-       id="guide4157" />
-    <sodipodi:guide
-       position="28.000012,43.999996"
-       orientation="0,-8"
-       id="guide4159" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5458">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-384.57143,-499.798)"
-     style="display:inline">
-    <g
-       transform="matrix(1.4285708,0,0,1.4285708,-163.67324,-235.91308)"
-       id="layer1-7"
-       inkscape:label="Capa 1">
-      <g
-         transform="translate(-2.5589574e-6,2.2518306e-5)"
-         id="layer1-9"
-         inkscape:label="Capa 1">
-        <rect
-           rx="13.999994"
-           ry="13.999994"
-           y="517.79797"
-           x="386.57144"
-           height="28"
-           width="27.999989"
-           id="rect4175"
-           style="opacity:1;fill:url(#linearGradient4238);fill-opacity:1;stroke:none" />
-        <path
-           style="opacity:0.2;fill:url(#linearGradient4277);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.6000002px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 36 16 L 24 23 L 22 21 L 14 21 L 10 25 L 28 43 C 28.202414 43.168679 28.413095 43.314997 28.628906 43.445312 C 37.458766 41.364763 44 33.482972 44 24 L 36 16 z "
-           transform="matrix(0.70000031,0,0,0.70000031,383.77144,514.99796)"
-           id="path4269" />
-        <image
-           y="520.59796"
-           x="389.37143"
-           id="image4190"
-           xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAO
-YUlEQVRoge1Za5Ac1XX++jnd0zPTPc+dmd3Z1Uq7K8kWsrQCDAEksAJEwrFCXFAOcUh+JEUqiewQ
-IQIJYkuQwkaVHxFQ2AJDHhS2kw0lkIMLCMS8XzICCSGvXqt9z3t6nt09/cyP0Q47OyMiBMKVKn//
-+tx7zz3fPfeee+5p4Df49YL4vBSNjIywiUTCNf89PT2t7ty50/y89J8Jn5nAEz996qJQV3QLxwub
-PF7vMEmSsEwTuUzmFwfeeucP77rrb5Kfh6FnwjkT+Mno3itjPX13RLoT1/pEPyiKamm3LBMfHXj7
-yfcPvPvA8LrLNjnAZo8kAQBq5VItNTH5vZtvvvG/P5v550Bgz2OPXb7yggvv6e7tv5wXPAxBdFZh
-miZmZ5OwTV3vW9LPkiTZbHMcB+WibI4f/eg7m69e/4NzNx+g/u8uH2N0dO+VF1x42dO9SwdXsi4X
-dSbjLcvCbDILXzAGByQl8C4sJEAQBDieJ3m3cN3FF1849/RT/3ngvBPYs2cPE+sf+PGSwZUDC42Z
-h2mayGYzcBwHqqpAMwm43R44DqCrFbjd7rYxHO8GzbiuGRgcePHFF56bORcC7ZacARznj/X0DXx1
-sfGGoSOdyaKsaJBCUTCcgGQ6C8d2AACsi0OpXIVclJGTZeRlGZlsFqbZCFC9/ctcl1y2/snvf3+P
-eC4E6LPtaJPWTVIg2CJzHAdysQyfP9jcIgRJgiBIOI7d+CYI0JwHhk1APH2IbdtGvlhAQBTBMAyW
-DKxYWikWbwLwqc9DG4GRkRE6kVjLh0KN7+PHj9vbt2+vgWzfbYVCAV4pgMVeWfztkwKoFHNwHAcE
-QYAkSYj+IPL5LLrCYbhcHCLxnh0jIyOPAkBi7VreyOQ3kRS9NDOXfPXQoffeGR0dtT6RwMjICDl8
-6ZWbvT7xb6VA8HKKbjRJ0SWl/3rhlWfSc9OrLMtqCZeGYbYZCwAURYFYdGgFXwByQYYoiY12goDH
-J6FcLkMURYj+UGzFqjW/CMcSCESilwfWR8AwDHLpFJauWP690dHRv+tEgACAxx//SSLcHX1ixerh
-DYLHi8XRxbZtTJ06Cd204Q8EQJEkfKIP5ZoGweNtU5rPZSHLZfT0LWuRm6aBWllGOBJqEs9n0lCV
-GlyChFo5j8HBwTZ92dScfOz4weU3bt6cbVus3bt3h1esGX75S2suWsfxfJvx8yvIcjzSORlSuAea
-YWMumQZJUdBUBQzDwrJMWFbDIyRJYXpqCpFovEUPSVKolEuolovwiSIcx4GiauA8frg4N7KpGURj
-sbb5Od7NO7p5cTwSOPjqq6+mWnT6w/Fv9w+uHKLpzudZVRTUagqqtRpIwkEmnUJV1QHOB9UAaJcH
-imaiWKqhWKwinyuiWq2CJDvfEVIgBLmQAwAU8gVwggSOb4RYy+q4zUFRFBLLhjYsv2DtpsVtpOCT
-trg4rm2Q4zjIZDLQTBsE44IYCCPc1YViuQzG7YNXCoIVJMymMlBVFT7RD58UhEcMgKQ5eL2+jgYx
-DAtNraOQz4GkOcwvnOPYAEFCVZSOJAACSrW6ZbGUDgQCGzoZn83lIIgBLPQMTTPQVAU0wzRWhqYR
-jvdCUxVUKhV4vY3zwLs9cEBAqVbgFaU2U2I9vdB0B5peRr5cA0CgkE1CEv2YTuXBMSVIogCfz7fA
-fIAg2gMGaZpGm1BVFLC8gE7birBNpGdOwXGcpozj3VAMG5qmNfoQBLw+CZraeTV1XQcBAiTtgj8Y
-gT8YRiAYhhQIIRxPwKZYTE/PtszhADDt9uycLBfl99oI1Ovg+farHwC64t3wCW6kZ061bBHe40Ox
-WoN9Wub2eKFpnQmUigUQJAmGbT4foCo18IIHAOARJdQNs0W/Y9ugCOJf2ggYRv2thUwBQFW1jhMT
-BIm6qiDcFYVf9CI7OwFD10+3EWDdXpSrFQAAy7pg6DoMQ2/TU69rgOM0PWSaBmzLaEbA+XukhYDj
-wFCVahuB2empo9VKeZG0c4rE8Tw4V2PVAsEwwqEgMjPj0DUVQOOA6haaro/19GF26lSLDk1TEY31
-gOPdqGs1AICcTSEUibT0oymqJZKVigXUapU2m0jH1F+Uc5kWoWPbHQnQNA1Dr8M+3e4TJfT0JJBL
-TkLOpmHbNizn43DIuwVwHIeSnIfjOHAcB7nULOpqDS6Og62rqJZLsMw6vKK/OY+h66hVq5idmUUq
-lUYymUImk8GG3/m9PU/97IUfPfrofwTm+1IDAwNaOBz5enff0q55FxqmCRfHdyRhWya0er0ZuxmW
-hegTodZKKMkFeEQ/KnKuGZE4t4DU7AQY1oVatQIXZcMruKHUdUj+IFLTEwhHY+D4xnyO4yA9NwNJ
-kuARQ+AEEUW5gFAwgGhPLxPt6Rt2e7irrvnapmdGR59UqP379+tXfW1Dvbd/cAt7enuoigKG5Tre
-yrzbjUxyGiCoJkmSouDx+kBTJLLJadRKMiR/EBRNw7YdyOlpnDi0H4XUBATeBcvQkZybha7riIZE
-lOQCdMsGTdNITk3C6/EgFImiUi4iNT2OYEBEKBJpJoJe0d/NcK4rNl+95SkKAJYPDZVsy/xGon/Q
-T5IkWJZFsVRqrspCEAQBSfJDzqVQq9UgeHxNuYvjEAyFQTgGONKEUi5gfOwDHH3/jQcnTx3feMf2
-bX//r48/ujMoeebMmvy8oZQllqE9DGHzk0cP50589H7GzXOSoWvIp6fh5mkMDg7C6/O1LGYjERR7
-CMpONKX333//4OqLLntx9bpLekmKQrlchukQHZM1oLHPT4wdAcN7EYn3tmSlhdQUBpb0AgDeevWl
-qbFD+9fceeedcic9d9xxxxDP84lcLjexYtXawIZrv/6uPxhutiuKApIkYdt226tu6tSJ1kf9ww8/
-vHxw1brnVn5l3RKSJBsk7EZMX2igYRhQKiWIXg+SqSSyhRJ6l60EezqunzryPobXrsH4sTH9rZd/
-vvm22257qeMqLMKex5+46PKNm971SX6UyhXUFB0O2diqWq2KnliwxY7ZyfHWN/Gzzz6b/9LQsp+p
-Sm1LVzwhCR4PaIqAUq2iXJShqgqMugaKcBAI+EHTNCTJD6+bx/T4cciFPGzTBOXoyKXnSoffe/ub
-3/3u1rMunVz721cP82LoJt1hQLICOMELF8eDohmwHI9sOgOPwDdJTJ4cS3dMGe+5557lfcuGHlg1
-/NVr4oklZzW5ZVmoVMr4cP+bJyeOjz3PMNQDt95661EA2Lt3byLcO7iN5YRLHdtCLjVXc0zjn48e
-+eDotm3b3gWAffv2uflw/yTBiaGuWPfp1JxqeUBZlgWlnEd3NIRSIYfXXti39Yx1oRtuuIFavXr1
-n8a6+3asGr44GOtdwrELrv7FqGsqDrz9mvzLN1+77b77/uHxefmeH/3bty6+4qqd4a7YkFavo1xV
-oWo6GJpEKZfSoVfvqhn8k+XcyVsuuOJ3764oKiyHAutyoVouwcWQ8EtSS9ZazMzhxMHXD84dPrjx
-rApbu3btuiwYid6Z6B+6Lt67BIFQpBkVapUyZibHcfTwB/+TSc78yY4dO6bnxz30g0f+7NIrr3kk
-1tOHTDYPi+LA8cLHpFUFpqHBdgDbqEOQwiiWyqgqChzbRrCrGwRBQKkU4XVzzUN8cuwQpn/19vV/
-ecstT591ZW5kZIRkWXbIxfM3ROOJCEnSsG0T1WIJ2WzyGdM0X15czH374PEjvUsHVspyEQbJgWEb
-745qpQLLNuH1+lAuyhD9AVSrVeTyBUihLjAsh5KcQzY1A38wAikYQb1WhYsGcpk5SDwNOTV795br
-Nt571mWVnTt32gDGANx7Nv3/6aEfbpSCwZW2bUG3KTAuFwqFAlTThlcKwDYtTExMALoCKRACRdEg
-HAeObTfumkAYUiAMOZ+BnE1CzibBUzaGBpYhFArjw2ppPfApClufFh5BAEmSME0TBEmiXtdgUS74
-/CEQBAmjrkDgaEjBRhLndrsRjXYhPzfRzLUAQAqE4RHcWL1mHbxeL8LhxvadrzudtQc+LaqlEmzL
-xnz9uJBNwyEZGJoClmUAtYRwOAKHYJpjON6NUDiM5MQYon1DIECgVsrDL3lBURTcHh80TW1kCvlG
-geK8eYCmAYJo1Ex13UAoEoWpVmApRSj5JFgKsEwTptX6yvIHI2Bg4Nh7r2DiyH74BK5ZR6JdAorF
-IrLpJI6NHXkJOI8eMM1GZkmQFFxuATTNINE/iLmpk/AIPKLRGDKZLOqmg3CsB3q9DtblQqVURDza
-heVDgyiXS8glJ8ByPHTDQKkoo5ScPKkrlX80dfWn55VAPB55+eD+t17zBruuYD1BMAyNSjGHeLwb
-wWCjsOXzCpiZTUJTaigWcojEEyjlU1ixfAA0TZ8+F406kW3bmD51AhOH3vzj22+//Y35ec4bgRtv
-vNECsP6Hjzz27Lorrt0cCIbA9iVa+vhECXHbQTI1BUVVUVfK6OmOdS4mEAQyc9PHZ2dnP1ooP29n
-YB5SsGs8Gu/G/Fujrd3vRyQcRC07hURPFMH5qvIilOQCpsaPPbR79+7iQvl588A8TMuUdb2OT0pD
-qiUZJ3516BuVYv7CpStWb1+6/Ms8vyB11vU63nnlhcnv/NVfPLB47Kf6xXQuGP7KRceUSuHbXfFe
-Yb4gthiT48df//DAuyN377jrxaW9fc9XS4WpXCa9wjTq3lxqDoffe+d1OZv7o+ee+3l68djP7T/x
-J+G+++4L9g9++dE1l2y4XvC2vq5M08Rrz+/795tv+ua3Fo4ZGRkJuN1uDgBmZmbyDz74YL2T7i+E
-wGmD6HhiyWOrhn/r9+N9/R6aZuA4Dk4e+0g9/M4b67du/fNfnoveL4zAPHbt2nV9z9IVf0DRzA26
-po1lZifv3bbtr3/8RdvxWUFs377du3Xr1jOf7N/g/wn+F80bIwhmCtLUAAAAAElFTkSuQmCC
-"
-           preserveAspectRatio="none"
-           height="22.400009"
-           width="22.400009" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/kolab2/locale/ar/fusiondirectory.po b/kolab2/locale/ar/fusiondirectory.po
deleted file mode 100644
index 537dd508baa30ee5a56c4ca92e88457b3b24901e..0000000000000000000000000000000000000000
--- a/kolab2/locale/ar/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"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/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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Ø®Ø¯Ù…Ø§Øª"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Ø®Ø·Ø£ Ø¯Ø§Ø®Ù„ÙŠ"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Ø®Ø·Ø£"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 6a7739248d760640518be503fec515aeb6aee89c..0000000000000000000000000000000000000000
--- a/kolab2/locale/ca/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaciÃ³"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index b8040c3adf50c2adf522cb3d9001ff933085f176..0000000000000000000000000000000000000000
--- a/kolab2/locale/cs_CZ/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "NastavenÃ ÃºÄtu v Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "ÃšÄet v Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "PovÄ›Å™enÃ"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "datovÃ½ objem zprÃ¡vy"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "u tohoto ÃºÄtu nenÃ omezen datovÃ½ objem zprÃ¡vy"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "informace o Free/Busy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL adresa"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "BudoucÃ"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dny"
-
-#: 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 "Pravidla pro pozvÃ¡nky"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "VÃ½chozÃ zÃ¡sada"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "VÃ½chozÃ pravidla pozvÃ¡nek"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "RuÄnÃ"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "VÅ¾dy pÅ™ijmout"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "vÅ¾dy odmÃtnout"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "OdmÃtnout, pokud je v konfliktu"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "zeptat se, pokud je v konfliktu"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "e-mailovÃ¡ adresa"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "Sada pravidel pro tuto e-mailovou adresu"
-
-#: 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 "NeurÄeno"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "ZprÃ¡vy"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Ãškoly"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "DenÃky"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "KalendÃ¡Å™"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "PoznÃ¡mky"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "PÅ™ÃchozÃ"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "RozepsanÃ©"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "OdeslanÃ©"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "NevyÅ¾Ã¡danÃ¡ poÅ¡ta"
-
-#: 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 "VÃ½chozÃ"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "NastavenÃ pro e-mail nemohou bÃ½t odebrÃ¡na dokud s k nim vÃ¡Å¾Ã povÄ›Å™enÃ."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "ÄŒekÃ¡ se na Kolab, aÅ¾ odebere nastavenÃ e-mailuâ€¦"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Nejprve prosÃm odeberte nastavenÃ© e-mailu!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Zapnout zjiÅ¡Å¥ovÃ¡nÃ pÅ™edÃ¡vajÃcÃho stroje pomocÃ MX zÃ¡znamu"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "PÅ™edÃ¡vajÃcÃ stroj"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: 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"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr "Kolab 2 e-mail"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr "E-mailovÃ¡ sluÅ¾ba Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "informace"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr "DomÃ©novÃ½ nÃ¡zev Postfix"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "sprÃ¡vci Cyra"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr "SprÃ¡vci Cyrus pro kolab server"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "E-mailovÃ© domÃ©ny"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "SluÅ¾by"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "SluÅ¾ba POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Zapnout sluÅ¾bu POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "SluÅ¾ba POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Zapnout sluÅ¾bu PO3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "sluÅ¾ba IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Zapnout sluÅ¾bu IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "SluÅ¾ba IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Zapnout sluÅ¾bu IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "sluÅ¾ba Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr "Zapnout sluÅ¾bu Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr "sluÅ¾ba FTP FreeBusy (v reÅ¾imu zpÄ›tnÃ© kompatibility)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "sluÅ¾ba FTP Free/Busy (v reÅ¾imu zpÄ›tnÃ© kompatibility, nekompatibilnÃ s Free/Busy v Kolab2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "SluÅ¾ba HTTP FreeBusy (v reÅ¾imu zpÄ›tnÃ© sluÄitelnosti)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "SkenovÃ¡nÃ e-mailÅ¯ Amavis"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "SkenovÃ¡nÃ e-mailÅ¯ nÃ¡strojem Amavis (viry/nevyÅ¾Ã¡danÃ¡ poÅ¡ta)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "NastavenÃ kvÃ³t"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr "Hranice, po jejÃmÅ¾ pÅ™ekroÄenÃ budou uÅ¾ivatelÃ© varovÃ¡ni ohlednÄ› blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty (%s)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-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:155
-msgid "Free/Busy settings"
-msgstr "NastavenÃ Free/Busy"
-
-#: 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: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: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:174
-msgid "SMTP privileged networks"
-msgstr "SÃtÄ›, ze kterÃ½ch je moÅ¾nÃ© pouÅ¾Ãvat SMTP"
-
-#: 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: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: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:194
-msgid "Accept Internet Mail"
-msgstr "PÅ™ijÃmat Internetovou poÅ¡tu"
-
-#: 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:275
-msgid "Internal error"
-msgstr "VnitÅ™nÃ chyba"
-
-#: 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:279
-msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "nÃ¡zev stroje"
-
-#: 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
deleted file mode 100644
index 8437e5a62965cbebab41b489b1db981b39df409f..0000000000000000000000000000000000000000
--- a/kolab2/locale/de/fusiondirectory.po
+++ /dev/null
@@ -1,363 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Kolab-2-Kontoeinstellungen"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Kolab-2-Konto"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Stellvertreter"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "MailgrÃ¶ÃŸe"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Keine BeschrÃ¤nkung der MailgrÃ¶ÃŸe fÃ¼r dieses Konto"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Frei/Belegt-Information"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Zukunft"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "Tage"
-
-#: 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 "Einladungs-Richtlinie"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Standard Policy"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Standard Einladungs-Policy"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manuell"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Immer annehmen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Immer ablehnen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Im Konfliktfall ablehnen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Im Konfliktfall manuell bearbeiten"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "Mailadresse"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "Policy fÃ¼r diese Mailadresse"
-
-#: 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 "Nicht angegeben"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Mails"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Journal"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notizen"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Posteingang"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "EntwÃ¼rfe"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Gesendet"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "Werbung"
-
-#: 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 "Vorgabe"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Die Mail-Einstellungen kÃ¶nnen nicht entfernt werden solange Vertretungen vorhanden sind!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Warte darauf, daÃŸ Kolab die Mail-Einstellungen entfernt..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Bitte entfernen Sie zunÃ¤chst die Mail-Einstellungen!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Aktiviere MX lookup fÃ¼r relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Relay host"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Host fÃ¼r Mail Relay"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr "Kolab-2-Mail"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr "Kolab-2-Maildienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix 'mydomain'"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr "Postfix Domainname"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Cyrus Administratoren"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr "Cyrus-Administratoren fÃ¼r kolab-Server"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Mail-DomÃ¤nen"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix 'mydestination'"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Dienste"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "POP3-Dienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Aktivieren des POP3 Diensts"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "POP3/SSL-Dienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Aktivieren des POP3/SSL Diensts"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "IMAP-Dienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Aktvieren des IMAP Dienstes"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL-Dienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Aktivieren des IMAP/SSL Diensts"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Sieve-Dienst"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr "Aktiveren des Sieve-Diensts"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr "FTP FreeBusy Dienst (legacy)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP Frei/Belegt-Dienst (alt, inkompatibel mit Kolab 2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Frei/Belegt-Dienst (alt)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "Amavis email scanning"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Email scannen (Virus/Spam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Kontingent-Einstellungen"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr "Quota Benutzungslimit bevor Benutzer gewarnt werden (%)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-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:155
-msgid "Free/Busy settings"
-msgstr "Frei/Belegt-Einstellungen"
-
-#: 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: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: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:174
-msgid "SMTP privileged networks"
-msgstr "SMTP privilegierte Netzwerke"
-
-#: 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: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:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr "Akzeptiere Internet-Mail"
-
-#: 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:275
-msgid "Internal error"
-msgstr "Interner Fehler"
-
-#: 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:279
-msgid "Error"
-msgstr "Fehler"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "Hostname"
-
-#: 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
deleted file mode 100644
index 5cabbd13c0fa16b04165a715fbe026f30fda2d72..0000000000000000000000000000000000000000
--- a/kolab2/locale/el_GR/fusiondirectory.po
+++ /dev/null
@@ -1,363 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el_GR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Kolab 2 "
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Kolab 2 "
-
-#: 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 "URL"
-
-#: 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 "Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· e-mail "
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "Ï€Î¿Î»Î¹Ï„Î¹ÎºÎ® Î³Î¹Î± Î±Ï…Ï„Î®Î½ Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· e-mail "
-
-#: 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 "Î‘Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± Î±Ï€Î¿Î¼Î¬ÎºÏÏ…Î½ÏƒÎ· Î¹Î´Î¹Î¿Ï„Î®Ï„Ï‰Î½ Î±Î»Î»Î·Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Î±Ï€ÏŒ Ï„Î¿ kolab"
-
-#: 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 "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· MX lookup Î³Î¹Î± relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Î£ÏÏƒÏ„Î·Î¼Î± Î´ÏÎ¿Î¼Î¿Î»ÏŒÎ³Î·ÏƒÎ·Ï‚"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Î— Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î¿ÏÎ¼ÎµÎ½Î· Ï…Ï€Î·ÏÎµÏƒÎ¯Î± Î³Î¹Î± Ï„Î·Î½ Î´ÏÎ¿Î¼Î¿Î»ÏŒÎ³Î·ÏƒÎ· Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr "Î‘Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î± Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Kolab 2 "
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr "ÎŒÎ½Î¿Î¼Î± Ï„Î¿Î¼ÎÎ± Postfix"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÎÏ‚ Cyrus"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Î¤Î¿Î¼ÎµÎ¯Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "Î£Î¬ÏÏ‰ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Amavis"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î¿ÏÎ¯Ï‰Î½"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹Î±Î¸ÎµÏƒÎ¹Î¼ÏŒÏ„Î·Ï„Î±Ï‚"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "Î ÏÎ¿Î½Î¿Î¼Î¹Î±ÎºÎ¬ Î´Î¯ÎºÏ„Ï…Î± SMTP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr "Î‘Ï€Î¿Î´Î¿Ï‡Î® Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ Î´Î¹Î±Î´Î¹ÎºÏ„ÏÎ¿Ï…"
-
-#: 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:275
-msgid "Internal error"
-msgstr "Î•ÏƒÏ‰Ï„ÎµÏÎ¹ÎºÏŒ ÏƒÏ†Î¬Î»Î¼Î±"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Kolab"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Î£Ï†Î¬Î»Î¼Î±"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "ÏŒÎ½Î¿Î¼Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
-
-#: 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
deleted file mode 100644
index 435f030374eb8409e5401bf51e0a7a08e1ea429c..0000000000000000000000000000000000000000
--- a/kolab2/locale/en/fusiondirectory.po
+++ /dev/null
@@ -1,361 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory VERSION\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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/es/fusiondirectory.po b/kolab2/locale/es/fusiondirectory.po
deleted file mode 100644
index 6d9c656d5a518116570792f50485f7d763de5f55..0000000000000000000000000000000000000000
--- a/kolab2/locale/es/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Delegaciones"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "TamaÃ±o del correo electrÃ³nico"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "No hay restricciÃ³n de correo para esta cuenta."
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "InformaciÃ³n de estado de presencia"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dÃas"
-
-#: 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 "PolÃtica de invitaciÃ³n"
-
-#: 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 "Manual"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Aceptar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Denegar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
-
-#: 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 "Sin definir"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tareas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Diario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contactos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Correo Entrante"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Borrador"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: 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 "Por defecto"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Â¡Las caracterÃsticas de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Esperando que Kolab elimine las caracterÃsticas de correo..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Â¡Por favor elimine las caracterÃsticas de correo primero!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir bÃºsquedas MX para los relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Servidor de reenvÃo (relay)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Administradores Cyrus"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Dominios de correo"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Servicios"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "Servicio POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "Servicio IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Servicio Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "Servicio de presencia de FTP (propio, no tiene interacciÃ³n con el servicio de presencia de Kolab2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Escaneo de correo Amavis (virus/spam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "ConfiguraciÃ³n de cuotas"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "ConfiguraciÃ³n de Presencia"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
-
-#: 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:178
-msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: 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: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:275
-msgid "Internal error"
-msgstr "error interno"
-
-#: 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:279
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "nombre de Maquina"
-
-#: 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
deleted file mode 100644
index 1ddbc13de6cba75a9967ee064f2f2a7523f6c245..0000000000000000000000000000000000000000
--- a/kolab2/locale/es_CO/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es_CO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "dÃas"
-
-#: 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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Error Interno"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 7b566b05d318eb94015f04edc358c01da087b9d6..0000000000000000000000000000000000000000
--- a/kolab2/locale/es_VE/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es_VE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Delegaciones"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "TamaÃ±o del correo electrÃ³nico"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "No hay restricciÃ³n de correo para esta cuenta."
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "InformaciÃ³n de estado de presencia"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dÃas"
-
-#: 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 "PolÃtica de invitaciÃ³n"
-
-#: 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 "Manual"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Aceptar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Denegar siempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
-
-#: 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 "Sin definir"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tareas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Diario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contactos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Correo Entrante"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Borrador"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviar"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: 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 "Por defecto"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Â¡Las caracterÃsticas de correo no pueden ser eliminadas mientras haya delegaciones configuradas!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Esperando que Kolab elimine las caracterÃsticas de correo..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Â¡Por favor elimine las caracterÃsticas de correo primero!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir bÃºsquedas MX para los relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Servidor de reenvÃo (relay)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaciÃ³n"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Administradores Cyrus"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Dominios de correo"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Servicios"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "Servicio POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "Servicio IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Servicio Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "Servicio de presencia de FTP (propio, no tiene interacciÃ³n con el servicio de presencia de Kolab2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Escaneo de correo Amavis (virus/spam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "ConfiguraciÃ³n de cuotas"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "ConfiguraciÃ³n de Presencia"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
-
-#: 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:178
-msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: 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: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:275
-msgid "Internal error"
-msgstr "error interno"
-
-#: 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:279
-msgid "Error"
-msgstr "Error"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "nombre de Maquina"
-
-#: 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
deleted file mode 100644
index 50f5d8ba3d3039cdf143571cafee9789fea0e772..0000000000000000000000000000000000000000
--- a/kolab2/locale/fa_IR/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fa_IR\n"
-"Plural-Forms: nplurals=1; plural=0;\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Ø®Ø·Ø§ÛŒ Ø¯Ø§Ø®Ù„ÛŒ"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Ø®Ø·Ø§"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index bf6812cf5199a76b55855d731e015b9b7cedbd6d..0000000000000000000000000000000000000000
--- a/kolab2/locale/fi_FI/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Palvelut"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Virhe"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Virhe"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 897827dd0f1ef57fb8213488a87f77153c5756a5..0000000000000000000000000000000000000000
--- a/kolab2/locale/fr/fusiondirectory.po
+++ /dev/null
@@ -1,364 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "ParamÃ¨tres du compte Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Compte Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "DÃ©lÃ©gations"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Quota de courriel"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Pas de taille maximale dâ€™envoi de courriel pour ce compte"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Information Free/Busy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futur"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "jours"
-
-#: 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 "Politique d'invitation"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Politique par dÃ©faut"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Politique dâ€™invitation par dÃ©faut"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manuel"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Toujours accepter"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Toujours rejeter"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Rejeter si il y a conflit"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Manuel si il y a conflit"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "adresse de courriel"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "politique pour cette adresse de courriel"
-
-#: 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 "Non spÃ©cifiÃ©"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Courriels"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "TÃ¢ches"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Journaux"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendrier"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contacts"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notes"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Boite de rÃ©ception"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Brouillons"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Messages EnvoyÃ©s"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: 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 "DÃ©faut"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Les paramÃ¨tres de courriel ne peuvent pas Ãªtre supprimÃ©s quand des dÃ©lÃ©gations sont configurÃ©esâ€¯!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "En attente de kolab pour la suppression des paramÃ¨tres de courriel..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Veuillez d'abord supprimer les paramÃ¨tres de courrielâ€¯!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Activer la recherche MX pour le serveur relais"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "HÃ´te relai"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Machine utilisÃ©e pour relayer les courriels"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr "Messagerie Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr "Service de courriel Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr "Nom du domaine postfix"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Administrateurs Cyrus"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr "Administrateurs Cyrus pour le serveur Kolab"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Domaines de courriel"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "Service POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Activer le service POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "Service POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Activer le service POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "Service IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Activer le service IMAP "
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "Service IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Activer le service IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Service Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr "Activer le service Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr "Service FTP FreeBusy (obsolÃ¨te)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "Service FTP FreeBusy (obsolÃ¨te, pas compatible avec Kolab2 FreeBusy)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Service HTTP FreeBusy (obsolÃ¨te)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "Scan des courriels par Amavis"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Scan des courriels par Amavis (antivirus/antispam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "PrÃ©fÃ©rences des quotas"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr "Limite du quota avant de prÃ©venir les utilisateurs (%)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-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:155
-msgid "Free/Busy settings"
-msgstr "PrÃ©fÃ©rences de Free/Busy"
-
-#: 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: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: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:174
-msgid "SMTP privileged networks"
-msgstr "RÃ©seaux SMTP privilÃ©giÃ©s"
-
-#: 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: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:186
-msgid "SMTP smarthost/relayhost"
-msgstr "Relais SMTP"
-
-#: 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: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:275
-msgid "Internal error"
-msgstr "Erreur interne"
-
-#: 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:279
-msgid "Error"
-msgstr "Erreur"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "Nom d'hÃ´te"
-
-#: 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
deleted file mode 100644
index 8c490e41b37311cab5f377fe90170f849d1b53f8..0000000000000000000000000000000000000000
--- a/kolab2/locale/hu_HU/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index af7098b2faac6d6358eca7032f7d8e9cba2ebc95..0000000000000000000000000000000000000000
--- a/kolab2/locale/id/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
-"Plural-Forms: nplurals=1; plural=0;\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 814ce1a604bd23424c05981347c9d407ad674de0..0000000000000000000000000000000000000000
--- a/kolab2/locale/it_IT/fusiondirectory.po
+++ /dev/null
@@ -1,365 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it_IT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: personal/kolab2/class_kolabAccount.inc:82
-msgid "Kolab 2"
-msgstr "Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:83
-msgid "Kolab 2 account settings"
-msgstr "Impostazioni account Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:100
-msgid "Kolab 2 account"
-msgstr "Account Kolab 2"
-
-#: personal/kolab2/class_kolabAccount.inc:104
-msgid "Delegations"
-msgstr "Deleghe"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Quota della  posta elettronica"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Nessuna restrizione di dimensione delle mail per questo account"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Informazioni di disponibilitÃ "
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "giorni"
-
-#: 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 "Politica d'invito"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default policy"
-msgstr "Politica predefinita"
-
-#: personal/kolab2/class_kolabAccount.inc:144
-msgid "Default invitation policy"
-msgstr "Politica d'invito predefinita"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual"
-msgstr "Manualmente"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Accetta sempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Rifiuta sempre"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Rifiuta se ci sono conflitti"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Manualmente se ci sono dei conflitti"
-
-#: personal/kolab2/class_kolabAccount.inc:152
-msgid "mail address"
-msgstr "Indirizzo mail"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "politica per questo indirizzo mail"
-
-#: 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 "Non specificato"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Posta elettronica"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Compiti"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Giornali"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Calendario"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Agenda dei contatti"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Note"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Posta in arrivo"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Bozze"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Messaggi inviati"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "Spam"
-
-#: 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 "Default"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Impostazioni mail non possono essere rimosse mentre ci sono delle deleghe configurate!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "In attesa di Kolab per la rimozione dei parametri di posta elettronica"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Rimuovi prima i parametri della posta elettronica !"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Verifica del record MX per il server relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-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:189
-msgid "Host used to relay mails"
-msgstr "Host usato per il  relay delle mail"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr "Posta elettronica Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr "Servizio di posta elettronica Kolab 2"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Informazione"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr "Nome di dominio Postfix"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Amministratore Cyrus"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr "Amministratori Cyrus per il server Kolab"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Dominio di posta elettronica"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Servizi"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "Servizio POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Abilita il servizio POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "Servizio POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Abilita il servizio POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "Servizio IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Abilita il servizio IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "Servizio IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Abilita il servizio IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Servizio Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr "Abilita il servizio Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr "Servizio FTP FreeBusy (legacy)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "Servizio d'opzione di disponibilitÃ  via FTP (vecchio, non compatibile con le opzioni di disponibilitÃ  di kolab2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servizio d'opzione di disponibilitÃ  via HTTP (vecchio)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "Scansione mail da parte di Amavis"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Scansione dei messaggi effettuata da Amavis (antivirus/antispam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Impostazioni della quota"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr "Quota limite di occupazione, prima di avvertire l'utente (%)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-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:155
-msgid "Free/Busy settings"
-msgstr "Impostazioni delle opzioni di disponibilitÃ "
-
-#: 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: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: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:174
-msgid "SMTP privileged networks"
-msgstr "Rete SMTP privilegiata"
-
-#: 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: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:186
-msgid "SMTP smarthost/relayhost"
-msgstr "Raccordo SMTP smarthost/relayhost"
-
-#: 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: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:275
-msgid "Internal error"
-msgstr "Errore interno"
-
-#: 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:279
-msgid "Error"
-msgstr "Errore"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "Nome dell'host"
-
-#: 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
deleted file mode 100644
index fe904248ede2fb8c2fe17b8e829eca87bb1219c5..0000000000000000000000000000000000000000
--- a/kolab2/locale/lv/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformÄcija"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "IekÅ¡Ä“jÄ kÄ¼Å«da"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "KÄ¼Å«da"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 947f9185622591b755b1fec48c90c6f756cb9a02..0000000000000000000000000000000000000000
--- a/kolab2/locale/nb/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Feil"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index cf4caea56a87d37fcc7c0ca0000516cf313d2014..0000000000000000000000000000000000000000
--- a/kolab2/locale/nl/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Delegaties"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "E-mail grootte"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Geen E-mail grootte restrictie voor dit account"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Free Busy informatie"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Toekomstig"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dagen"
-
-#: 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 "Uitnodigingsbeleid"
-
-#: 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 "Handmatig"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Altijd accepteren"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Altijd afwijzen"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Afwijzen bij conflicten"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Handmatig bij conflicten"
-
-#: 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 "Niet opgegeven"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Mails"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Taken"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr "Kranten"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "Kalender"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contacten"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Inbox"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Klad"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Verstuurd"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: 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 "Standaard"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:179
-msgid ""
-"Mail settings cannot be removed while there are delegations configured!"
-msgstr "Mail-instellingen kunnen niet worden verwijderd, terwijl er geconfigureerd delegaties zijn!"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:272
-msgid "Waiting for kolab to remove mail properties..."
-msgstr "Wachten op kolab om e-mail eigenschappen te verwijderen ..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Gelieve eerst de e-mail instellingen te verwijderen!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr "Sta MX record opzoeken voor relayhost toe"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Relay host"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Host die gebruikt wordt om E-mails te relayen"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Informatie"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Cyrus admins"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "Mail domeinen"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Services"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "POP3 service"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "POP3/SSL service"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "IMAP Service"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL service"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Sieve service"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Free/Busy service (vervallen)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Amavis email scannen (virus/anti-spam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Quota instellingen"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "Free/Busy instellingen"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "SMTP toegestane netwerken"
-
-#: 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:178
-msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr "Accepteer Internet E-mail"
-
-#: 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:275
-msgid "Internal error"
-msgstr "Interne error"
-
-#: 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:279
-msgid "Error"
-msgstr "Fout"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr "hostname"
-
-#: 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
deleted file mode 100644
index a6466c48ffbe1b93a418b630ef67ecaf52de222d..0000000000000000000000000000000000000000
--- a/kolab2/locale/pl/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: 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 "Delegacje"
-
-#: personal/kolab2/class_kolabAccount.inc:112
-msgid "Mail size"
-msgstr "Rozmiar poczty"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Brak ograniczeÅ„ co do wielkoÅ›ci poczty dla tego konta"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr "Informacja FreeBusy"
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "PrzyszÅ‚oÅ›Ä‡"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dni"
-
-#: 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 "Polityka zapraszania"
-
-#: 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 "RÄ™czne"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always accept"
-msgstr "Zawsze akceptuj"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Zawsze odrzuÄ‡"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "OdmÃ³w jeÅ›li koliduje"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Manual if conflicts"
-msgstr "Ustaw rÄ™cznie jeÅ›li koliduje"
-
-#: 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 "WÅ‚Ä…cz sprawdzanie MX dla relayhosta"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Host przekazujÄ…cy"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "Host uÅ¼yty do przekazywania poczty"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Informacja"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix mydomain"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "UsÅ‚ugi"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "UsÅ‚uga POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "UsÅ‚uga POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "UsÅ‚uga IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "UsÅ‚uga IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "UsÅ‚uga Sieve"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "UsÅ‚uga FTP FreeBusy (przestarzaÅ‚a, nie dziaÅ‚a z FreeBusy w Kolab2)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "UsÅ‚uga HTTP FreeBusy (przestarzaÅ‚a)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Skanowanie poczty (wirus/spam)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Ustawienia Quota"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "Ustawienia wolny / zajÄ™ty"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "uprzywilejowane sieci SMTP"
-
-#: 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:178
-msgid "Hosts/networks allowed to relay (multiple values comma-seperated)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: 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: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:275
-msgid "Internal error"
-msgstr "BÅ‚Ä…d wewnÄ™trzny"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "BÅ‚Ä…d"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 059817a79b519faa965002747c397126e1ab34a5..0000000000000000000000000000000000000000
--- a/kolab2/locale/pt/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 3fae05a37c7bbc9a71ea5abf96cb3a477ec7a597..0000000000000000000000000000000000000000
--- a/kolab2/locale/pt_BR/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\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 "Tamanho de correio"
-
-#: personal/kolab2/class_kolabAccount.inc:115
-msgid "No mail size restriction for this account"
-msgstr "Sem restriÃ§Ã£o de tamanho de correio para esta conta"
-
-#: personal/kolab2/class_kolabAccount.inc:122
-msgid "Free Busy information"
-msgstr ""
-
-#: personal/kolab2/class_kolabAccount.inc:125
-msgid "URL"
-msgstr "URL"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "Future"
-msgstr "Futuro"
-
-#: personal/kolab2/class_kolabAccount.inc:130
-msgid "days"
-msgstr "dias"
-
-#: 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 "Sempre aceitar"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Always reject"
-msgstr "Sempre recusar"
-
-#: personal/kolab2/class_kolabAccount.inc:146
-#: personal/kolab2/class_kolabAccount.inc:155
-msgid "Reject if conflicts"
-msgstr "Recusar se houver conflito"
-
-#: 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 "endereÃ§o de correio"
-
-#: personal/kolab2/class_kolabAccount.inc:153
-msgid "policy for this mail address"
-msgstr "polÃticas para este endereÃ§o de correio"
-
-#: 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 "Sem especificaÃ§Ã£o"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:147
-msgid "Mails"
-msgstr "Correios"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:148
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:149
-msgid "Journals"
-msgstr ""
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:150
-msgid "Calendar"
-msgstr "CalendÃ¡rio"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:151
-msgid "Contacts"
-msgstr "Contatos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:152
-msgid "Notes"
-msgstr "Notas"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:156
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:157
-msgid "Drafts"
-msgstr "Rascunhos"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:158
-msgid "Sent"
-msgstr "Enviados"
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:159
-msgid "SPAM"
-msgstr "SPAM"
-
-#: 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 "PadrÃ£o"
-
-#: 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 "Aguardando Kolab remover propriedades de correio..."
-
-#: personal/mail/kolab2/class_mail-methods-kolab.inc:275
-msgid "Please remove the mail settings first!"
-msgstr "Por favor, remova configuraÃ§Ãµes de correio antes!"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:29
-msgid "Enable MX lookup for relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr "Host de transmissÃ£o"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "InformaÃ§Ã£o"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr "DomÃnios de correio"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "ServiÃ§os"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "ServiÃ§o POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr "Ativar serviÃ§o POP3"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "ServiÃ§o POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr "Ativar serviÃ§o POP3/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "ServiÃ§o IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr "Ativar serviÃ§o IMAP"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "ServiÃ§o "
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr "Ativar serviÃ§o IMAP/SSL"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr "VerificaÃ§Ã£o de email Amavis"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Erro interno"
-
-#: 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:279
-msgid "Error"
-msgstr "Erro"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 1a439b39d645682cfa967b687981bbd27871d77c..0000000000000000000000000000000000000000
--- a/kolab2/locale/ru/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Ð’Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 69d7cc9ffeb7ab75b5d75c565088a8461e7f9a22..0000000000000000000000000000000000000000
--- a/kolab2/locale/ru@petr1708/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"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/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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 379c10ae7c3b617102fa749f67a47548577269bd..0000000000000000000000000000000000000000
--- a/kolab2/locale/sv/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\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 "URL"
-
-#: 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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "Information"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "TjÃ¤nster"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Internt fel"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Fel"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 98195404308b20ed6623c83a8a1343dce561dd49..0000000000000000000000000000000000000000
--- a/kolab2/locale/ug/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ug\n"
-"Plural-Forms: nplurals=1; plural=0;\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 48059d5d5284c800e7aec5ae775590f9f480583e..0000000000000000000000000000000000000000
--- a/kolab2/locale/vi_VN/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: vi_VN\n"
-"Plural-Forms: nplurals=1; plural=0;\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 ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "ThÃ´ng tin"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr ""
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr ""
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr ""
-
-#: 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:275
-msgid "Internal error"
-msgstr "Lá»—i ná»™i bá»™"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "Lá»—i"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index d98af2221d389ae7c1a273685731b9b40a7fcc27..0000000000000000000000000000000000000000
--- a/kolab2/locale/zh/fusiondirectory.po
+++ /dev/null
@@ -1,362 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR FusionDirectory Project
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
-"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\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 "URL"
-
-#: 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 "å¯ç”¨ä¸ç»§ä¸»æœºçš„ MX æŸ¥æ‰¾"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-msgid "Relay host"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:32
-#: admin/systems/services/kolab2/class_serviceKolab.inc:189
-msgid "Host used to relay mails"
-msgstr "ä¸ç»§é‚®ä»¶ä½¿ç”¨çš„ä¸»æœº"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:67
-msgid "Kolab 2 mail"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:68
-msgid "Kolab 2 mail service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:82
-msgid "Information"
-msgstr "æç¤ºä¿¡æ¯"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix mydomain"
-msgstr "Postfix 'mydomain'"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:87
-msgid "Postfix domain name"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins"
-msgstr "Cyrus ç®¡ç†å‘˜"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:91
-msgid "Cyrus admins for kolab server"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Mail domains"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:96
-msgid "Postfix mydestination"
-msgstr "Postfix mydestination"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:103
-msgid "Services"
-msgstr "æœåŠ¡"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "POP3 service"
-msgstr "POP3 æœåŠ¡"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:106
-msgid "Enable POP3 service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "POP3/SSL service"
-msgstr "POP3/SSL æœåŠ¡å™¨"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:110
-msgid "Enable POP3/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "IMAP service"
-msgstr "IMAP æœåŠ¡"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:114
-msgid "Enable IMAP service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL æœåŠ¡"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:118
-msgid "Enable IMAP/SSL service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Sieve service"
-msgstr "Sieve æœåŠ¡"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:122
-msgid "Enable Sieve service"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:126
-msgid "FTP FreeBusy service (legacy)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:127
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP FreeBusy æœåŠ¡ ï¼ˆè¿‡æ—¶çš„ï¼Œä¸èƒ½å’Œ Kolab2 FreeBusy äº’æ“ä½œï¼‰"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:131
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP FreeBusy æœåŠ¡ï¼ˆæ—§ï¼‰"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:135
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Amavis é‚®ä»¶æ‰«æ (ç—…æ¯’/åžƒåœ¾é‚®ä»¶)"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:141
-msgid "Quota settings"
-msgstr "Quota è®¾ç½®"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:144
-msgid "Quota occupation limit before warning users (%)"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:145
-#, php-format
-msgid "Warn users when using more than X% of their mail quota"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:155
-msgid "Free/Busy settings"
-msgstr "Free/Busy è®¾ç½®"
-
-#: 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:163
-msgid "Number of days to include when creating free/busy lists"
-msgstr ""
-
-#: 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:174
-msgid "SMTP privileged networks"
-msgstr "SMTP æŽˆæƒç½‘ç»œ"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:177
-msgid "Hosts/networks allowed to relay"
-msgstr "å…è®¸ä¸ç»§çš„ä¸»æœº/ç½‘ç»œ"
-
-#: 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:186
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:194
-msgid "Accept Internet Mail"
-msgstr "å…è®¸ Internet  é‚®ä»¶"
-
-#: 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:275
-msgid "Internal error"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:275
-msgid "Kolab account does not exist!"
-msgstr ""
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "Error"
-msgstr "é”™è¯¯"
-
-#: admin/systems/services/kolab2/class_serviceKolab.inc:279
-msgid "hostname"
-msgstr ""
-
-#: 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
deleted file mode 100644
index 1c4a734f6933aaa5bacab2ec4b952e85fe7c1a1a..0000000000000000000000000000000000000000
--- a/kolab2/personal/kolab2/class_kolabAccount.inc
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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.
-*/
-
-
-/*!
- * \brief This class contains all the function to manage the policy
- *        for the kolabAccount class
- */
-class PolicyAttribute extends CompositeAttribute
-{
-
-  function __construct ($description, $ldapName, $attributes, $acl = "", $label = "Composite attribute")
-  {
-    parent::__construct ($description, $ldapName, $attributes, "", "", $acl, $label);
-  }
-
-  protected function loadAttrValue ($attrs)
-  {
-    if (isset($attrs[$this->getLdapName()]["count"])) {
-      $values = array();
-      $values[0] = $attrs[$this->getLdapName()][0];
-      $values[1] = array();
-      for ($i = 1; $i < $attrs[$this->getLdapName()]["count"]; $i++) {
-        $values[1][] = $attrs[$this->getLdapName()][$i];
-      }
-      $this->setValue($values);
-    } else {
-      $this->resetToDefault();
-    }
-  }
-
-  function writeValues($values)
-  {
-    $value = $values[1];
-    array_unshift($value, $values[0]);
-    return $value;
-  }
-
-  function inputValue ($value)
-  {
-    return $value;
-  }
-
-  function readValues($val)
-  {
-    trigger_error("No one should call readValues");
-  }
-}
-
-class kolabAccount extends simplePlugin
-{
-
-/*
-  var $attributes     = array("kolabFreeBusyFuture", "unrestrictedMailSize", "calFBURL","kolabDelegate","kolabInvitationPolicy");
-*/
-  var $objectclasses  = array("kolabInetOrgPerson");
-  var $displayHeader  = TRUE;
-
-  /* Return plugin information for acl handling  */
-  static function plInfo()
-  {
-    return array(
-      'plShortName'     => _('Kolab 2'),
-      'plDescription'   => _('Kolab 2 account settings'),
-      'plIcon'          => 'geticon.php?context=applications&icon=kolab&size=48',
-      'plSmallIcon'     => 'geticon.php?context=applications&icon=kolab&size=16',
-      'plSelfModify'    => TRUE,
-      'plPriority'      => 20,
-      'plObjectType'    => array('user'),
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
-    );
-  }
-
- /*!
-  *  \brief The main function : information about attributes
-  */
-  static function getAttributesInfo ()
-  {
-    return array (
-      'section1' => array (
-        'name'  => _('Kolab 2 account'),
-        'attrs' => array (
-          new SetAttribute (
-            new MailAttribute (
-              _('Delegations'),
-              '',
-              'kolabDelegate'
-            )
-          )
-        )
-      ),
-      'section2' => array (
-        'name' => _('Mail size'),
-        'attrs' => array (
-          new BooleanAttribute (
-            _('No mail size restriction for this account'),
-            '',
-            'unrestrictedMailSize'
-          )
-        )
-      ),
-      'section3' => array (
-        'name' => _('Free Busy information'),
-        'attrs' => array (
-          new StringAttribute (
-            _('URL'),
-            '',
-            'calFBURL'
-          ),
-          new IntAttribute (
-            _('Future').' ('._('days').')',
-            '',
-            'kolabFreeBusyFuture',
-            FALSE,FALSE,FALSE,60
-          )
-        )
-      ),
-      'section4' => array (
-        'name' => _('Invitation policy'),
-        'attrs' => array (
-          new PolicyAttribute (
-            _('Invitation policy'),
-            'kolabInvitationPolicy',
-            array (
-              new SelectAttribute (_('Default policy'), _('Default invitation policy'),'anonymous', TRUE,
-                array('ACT_MANUAL','ACT_ALWAYS_ACCEPT', 'ACT_ALWAYS_REJECT', 'ACT_REJECT_IF_CONFLICTS', 'ACT_MANUAL_IF_CONFLICTS'),'',
-                array(_("Manual"), _("Always accept"),_("Always reject"),_("Reject if conflicts"),_("Manual if conflicts"))),
-              new SetAttribute (
-                new CompositeAttribute (
-                  _('Invitation policy'),
-                  'KolabInvitationPolicySpe',
-                    array(
-                      new MailAttribute ('', _('mail address'),'mailPolicy'),
-                      new SelectAttribute ('', _('policy for this mail address'),'policy', TRUE,
-                        array('ACT_MANUAL','ACT_ALWAYS_ACCEPT', 'ACT_ALWAYS_REJECT', 'ACT_REJECT_IF_CONFLICTS', 'ACT_MANUAL_IF_CONFLICTS'),'',
-                        array(_("Manual"), _("Always accept"),_("Always reject"),_("Reject if conflicts"),_("Manual if conflicts")))
-                    ),
-                    '/^([^:]+): (.+)$/',
-                    '%s: %s',
-                    '', _('Invitation policy')
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-  }
-
-  function execute ()
-  {
-    if ($this->attributesInfo['section3']['attrs']['calFBURL']->getValue() == NULL) {
-      $this->calFBURL= "https://".$this->parent->by_object['mailAccount']->gosaMailServer."/freebusy/".$this->parent->by_object['mailAccount']->mail.".ifb";
-      $this->attributesInfo['section3']['attrs']['calFBURL']->setValue($this->calFBURL);
-    }
-    return parent::execute();
-  }
-
-}
-?>
diff --git a/kolab2/personal/mail/kolab2/class_mail-methods-kolab.inc b/kolab2/personal/mail/kolab2/class_mail-methods-kolab.inc
deleted file mode 100644
index d7977b872989662fe8b299e420f8741edfac1f0f..0000000000000000000000000000000000000000
--- a/kolab2/personal/mail/kolab2/class_mail-methods-kolab.inc
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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 mailMethodKolab extends mailMethodCyrus
-{
-  /* Allow modification of account_ids for existing mail accounts */
-  protected $modifyableMail   = FALSE;
-
-  /* Allow modification of the mail server attribute existing mail accounts */
-  protected $modifyableServer = TRUE;
-
-  /* Enforces same value for 'mail' as used for 'cn' */
-  protected $mailEqualsCN   = TRUE;
-
-  /* Enabled mail domain selection. If enabled getMailDomains must the domain parts */
-  protected $enableDomainSelection  = FALSE;
-  protected $enableQuota            = TRUE;
-  protected $enableVacationRange    = FALSE;
-  protected $enableFolderTypes      = TRUE;
-
-  protected $attributes           = array(
-      "kolabDeleteflag" => "kolabDeleteflag",
-      "kolabFolderType" => "kolabFolderType",
-      "alias" => "gosaMailAlternateAddress",
-      "cyrus-userquota" => "gosaMailQuota",
-      "kolabHomeServer" => "gosaMailServer");
-
-  protected $user_prefix    = 'user.';
-  protected $share_prefix   = 'shared\\.';
-
-  /* gosaSharedFolderTarget settings,
-   *   E.g.
-   *     AccountID = 'shared/john.folder@fusiondirectory.org'
-   *     'kolab+' will result in gosaSharedFolderTarget: kolab+shared/john@fusiondirectory.org
-   *
-   * May be overridden in the fusiondirectory.conf.
-   */
-  protected $mailSharedPrefix = 'kolab+';
-
-  /* Account ID creation */
-  protected $user_id    = "%prefix%%uattrib%";
-  protected $share_id   = "%prefix%%cn%@%domain%";
-
-  protected $userObjectClasses  = array("kolabInetOrgPerson");
-  protected $shareObjectClasses = array("kolabSharedFolder");
-
-  /* Handle account removal like a master/slave kolab setup.
-   * The kolabDeleteflag will be added for each server.
-   */
-  protected $masterSlave = TRUE;
-
-  protected $acl_map = array(
-      "lrsw"          => "read",
-      "lrswp"         => "post",
-      "p"             => "external post",
-      "lrswip"        => "append",
-      "lrswipcd"      => "write",
-      "lrswipcda"     => "admin",
-      "lrswipkxtecda" => "full-admin",
-      " "             => "none");
-  public function fixAttributesOnLoad()
-  {
-    mailMethodCyrus::fixAttributesOnLoad();
-
-    // Tell our parent that there is a relatioship between alias and
-    //  gosaMailAlternateAddress.  (Avoid plugin::cleanup to filter out alias).
-    if (isset($this->parent->saved_attributes['gosaMailAlternateAddress'])) {
-      $this->parent->saved_attributes['alias'] = $this->parent->saved_attributes['gosaMailAlternateAddress'];
-    }
-  }
-
-  public function fixAttributesOnStore()
-  {
-    mailMethod::fixAttributesOnStore();
-    $this->build_account_id();
-    $this->parent->attrs['kolabDeleteflag'] = array();
-
-    /* The folderType is set by ::setFolderType(...) */
-    $this->parent->attrs['kolabFolderType'] = array();
-    if ($this->type == "group") {
-      $this->parent->attrs['gosaSharedFolderTarget'] =
-        $this->mailSharedPrefix.$this->account_id;
-    }
-  }
-
-  public function fixAttributesOnRemove()
-  {
-    mailMethod::fixAttributesOnRemove();
-    foreach ($this->attributes as $source => $dest) {
-      $this->attrs[$dest]   = array();
-      $this->attrs[$source] = array();
-    }
-    if ($this->type == "user") {
-      $ocs = $this->userObjectClasses;
-    } else {
-      $ocs = $this->shareObjectClasses;
-    }
-    $this->parent->attrs['objectClass'] = array_merge($this->parent->attrs['objectClass'], $ocs);
-    $this->parent->attrs['objectClass'] = array_unique($this->parent->attrs['objectClass']);
-
-    if ($this->type == "group") {
-      $this->parent->attrs['gosaSharedFolderTarget'] = array();
-    }
-
-    /* If the mail setup includes Master and Slave Kolab Server, then we have to remove the
-     *  mailAccount from server, by adding a kolabDeleteflag for each server.
-     * */
-    if ($this->masterSlave) {
-      $this->parent->attrs['kolabDeleteflag'] = array();
-      foreach ($this->getKolabHost() as $md) {
-        $this->parent->attrs['kolabDeleteflag'][] = $md;
-      }
-    } else {
-      $this->parent->attrs['kolabDeleteflag'] = $this->parent->gosaMailServer;
-    }
-    if ($this->folderTypesEnabled()) {
-      $this->parent->attrs['kolabFolderType'] = array();
-    }
-  }
-
-  /* \brief   Some method require special folder types, "kolab" for example.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array Return folder types.
-   */
-  public function getAvailableFolderTypes()
-  {
-    $ret = array();
-    $ret['CAT']['']         = _("Unspecified");
-    $ret['CAT']['mail']     = _("Mails");
-    $ret['CAT']['task']     = _("Tasks");
-    $ret['CAT']['journal']  = _("Journals");
-    $ret['CAT']['event']    = _("Calendar");
-    $ret['CAT']['contact']  = _("Contacts");
-    $ret['CAT']['note']     = _("Notes");
-
-    $ret['SUB_CAT']['']['']     = _("Unspecified");
-    $ret['SUB_CAT']['mail'][''] = _("Unspecified");
-    $ret['SUB_CAT']['mail']['inbox']      = _("Inbox");
-    $ret['SUB_CAT']['mail']['drafts']     = _("Drafts");
-    $ret['SUB_CAT']['mail']['sentitems']  = _("Sent");
-    $ret['SUB_CAT']['mail']['junkemail']  = _("SPAM");
-
-    $ret['SUB_CAT']['task']['default']     = _("Default");
-    $ret['SUB_CAT']['journal']['default']  = _("Default");
-    $ret['SUB_CAT']['event']['default']    = _("Default");
-    $ret['SUB_CAT']['contact']['default']  = _("Default");
-    $ret['SUB_CAT']['note']['default']     = _("Default");
-
-    return $ret;
-  }
-
-  /*! \brief  Checks whether this account is removeable or not.
-              There may be some dependencies left, eg. kolab.
-   */
-  public function accountRemoveable(&$reason = "")
-  {
-    if (isset($this->parent->attrs)) {
-      $checkArray  = array("kolabInvitationPolicy","unrestrictedMailSize", "calFBURL","kolabDelegate","kolabFreeBusyFuture");
-      foreach ($checkArray as $index) {
-        if (isset($this->parent->attrs[$index])) {
-          $reason = _("Mail settings cannot be removed while there are delegations configured!");
-          return FALSE;
-        }
-      }
-    }
-    return TRUE;
-  }
-
-  /* \brief  Returns the selected folder type.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array  The folde type.
-   */
-  public function getFolderType($default)
-  {
-    if ($this->enableFolderTypes && isset($this->parent->attrs['kolabFolderType'][0])) {
-      $type = $this->parent->attrs['kolabFolderType'][0];
-      if (strpos($type, ".")) {
-        list($cat,$sub) = explode(".", $this->parent->attrs['kolabFolderType'][0]);
-      } else {
-        $sub = "";
-        $cat = $type;
-      }
-
-      return array("CAT" => $cat, "SUB_CAT" => $sub);
-    } else {
-      return $default;
-    }
-  }
-
-  /* \brief  Returns the selected folder type.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array  The folde type.
-   */
-  public function setFolderType($type)
-  {
-    global $config;
-    $type_str = trim($type['CAT'].".".$type['SUB_CAT']);
-    $type_str = trim($type_str, ".");
-    $attrs = array();
-    if (empty($type_str)) {
-      $attrs['kolabFolderType'] = array();
-    } else {
-      $attrs['kolabFolderType'] = $type_str;
-    }
-
-    $ldap = $config->get_ldap_link();
-    $ldap->cd ($this->parent->dn);
-    $ldap->modify($attrs);
-    if ($ldap->success()) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Successful</b>",
-          "<b>MAIL:</b> Set folderType to '".$type_str."'");
-    } else {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Failed: </b>".$ldap->get_error(),
-          "<b>MAIL:</b> Set folderType to '".$type_str."'");
-    }
-  }
-
-  public function setQuota($number)
-  {
-    mailMethod::setQuota($number);
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Skipped, part of kolabd!</b>",
-        "<b>Set account quota</b> on server '".$this->parent->gosaMailServer);
-    return TRUE;
-  }
-
-  public function setFolderACLs($permissions)
-  {
-    mailMethod::setFolderACLs($permissions);
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Skipped, part of kolabd!</b>",
-        "<b>Setting folder ACLs!</b>", "");
-    return TRUE;
-  }
-
-  public function updateMailbox()
-  {
-    mailMethod::updateMailbox();
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Skipped, part of kolabd!</b>",
-        "<b>Add/Update account</b> on server :".$this->parent->gosaMailServer);
-    return TRUE;
-  }
-
-  public function deleteMailbox()
-  {
-    mailMethod::deleteMailbox();
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "Skipped, part of kolabd!",
-      "<b>Setting Quota</b>");
-    return TRUE;
-  }
-
-  public function allow_remove(&$reason)
-  {
-    if (isset($this->parent->attrs)) {
-      if (in_array_ics("kolabDeleteflag", array_keys($this->parent->attrs))) {
-        $reason = _("Waiting for kolab to remove mail properties...");
-        return FALSE;
-      } elseif (in_array("gosaMailAccount", $this->parent->attrs['objectClass'])) {
-        $reason = _("Please remove the mail settings first!");
-        return FALSE;
-      }
-    }
-    return TRUE;
-  }
-
-  /*! \brief   Returns all kolabHost entries from the k=kolab object.
-      @return  See \brief
-   */
-  public function getKolabHost()
-  {
-    global $config;
-    $host = array();
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search("(&(objectClass=kolab)(k=kolab)(kolabHost=*))", array("kolabHost"));
-
-    if ($ldap->count() == 1) {
-      $attrs = $ldap->fetch();
-      for ($i = 0; $i < $attrs['kolabHost']['count']; $i++) {
-        $host[] = $attrs['kolabHost'][$i];
-      }
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Found: ".trim(implode($host, ", "), ", ")."</b>",
-          "Revceiving 'Mail hosts for kolab22'.");
-    } elseif ($ldap->count() == 0) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>No mailHost entries found. Check k=kolab and mailHost</b>",
-          "Revceiving 'Mail hosts for kolab22'.");
-    } else {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Found more than one kolab configuration object. Giving up.</b>",
-          "Revceiving 'Mail hosts for kolab22'.");
-    }
-
-    return $host;
-  }
-}
-?>
diff --git a/kolab2/personal/mail/kolab2/class_mail-methods-kolab22.inc b/kolab2/personal/mail/kolab2/class_mail-methods-kolab22.inc
deleted file mode 100644
index 38f8ac9667fea3b54e8d4477cf6be663091d027d..0000000000000000000000000000000000000000
--- a/kolab2/personal/mail/kolab2/class_mail-methods-kolab22.inc
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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 mailMethodKolab22 extends mailMethodKolab
-{
-
-  /* Allow modification of account_ids for existing mail accounts */
-  protected $modifyableMail = FALSE;
-
-  /* Enforces same value for 'mail' as used for 'cn' */
-  protected $mailEqualsCN   = TRUE;
-
-  /* Enabled mail domain selection. If enabled getMailDomains must the domain parts */
-  protected $enableDomainSelection  = TRUE;
-  protected $enableQuota            = TRUE;
-  protected $enableVacationRange    = FALSE;
-  protected $enableFolderTypes      = TRUE;
-
-  protected $userObjectClasses  = array("kolabInetOrgPerson");
-  protected $shareObjectClasses = array("kolabSharedFolder");
-
-  protected $acl_map = array(
-    "none"             => "none",
-    "post"             => "post",
-    "read"             => "read",
-    "read/post"        => "read/post",
-    "append"           => "append",
-    "write"            => "write",
-    "read anon"        => "read anon",
-    "read anon/post"   => "read anon/post",
-    "read hidden"      => "read hidden",
-    "read hidden/post" => "read hidden/post",
-    "all"              => "all"
-  );
-
-  protected $default_acls = array("__anyone__" => "none", "__member__" => "write");
-
-
-  /*! \brief  Returns configured acls
-   */
-  public function  getFolderACLs($ldap_acls)
-  {
-    $this->reset_error();
-    $imap_acls = mailMethodKolab::getFolderACLs(array());
-
-    foreach ($imap_acls as $user => $acl) {
-      if (!isset($ldap_acls[$user])) {
-        $ldap_acls[$user] = $acl;
-      } else {
-        // Ldap attributes come first in kolab22.
-      }
-    }
-
-    /* Merge given ACL with acl mapping
-       This ensures that no ACL will accidentally overwritten by gosa.
-     */
-    foreach ($ldap_acls as $user => $acl) {
-      if (!isset($this->acl_mapping[$acl])) {
-        $this->acl_mapping[$acl] = $acl;
-      }
-    }
-
-    return $ldap_acls;
-  }
-
-
-  /*! \brief Returns a list of configured mail domains
-      @return Array A list of mail domains
-   */
-  public function getMailDomains()
-  {
-    global $config;
-    $domains = array();
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search("(&(objectClass=kolab)(k=kolab)(postfix-mydestination=*))", array("postfix-mydestination"));
-
-    if ($ldap->count() == 1) {
-      $attrs = $ldap->fetch();
-      for ($i = 0; $i < $attrs['postfix-mydestination']['count']; $i++) {
-        $domains[] = $attrs['postfix-mydestination'][$i];
-      }
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Found: ".trim(implode($domains, ", "), ", ")."</b>",
-          "Revceiving 'Mail domains for kolab22'.");
-    } elseif ($ldap->count() == 0) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>No domains found. Check k=kolab and postfix-mydestination</b>",
-          "Revceiving 'Mail domains for kolab22'.");
-    } else {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Found more than one kolab configuration object. Giving up.</b>",
-          "Revceiving 'Mail domains for kolab22'.");
-    }
-
-    return $domains;
-  }
-}
-?>
diff --git a/ldapdump/addons/ldapdump/class_ldapDump.inc b/ldapdump/addons/ldapdump/class_ldapDump.inc
index 9ebad8ee0d93eb48154252310425f4d1393c6d6c..db36b6a0401e401212220534a4045d1e062c98e3 100644
--- a/ldapdump/addons/ldapdump/class_ldapDump.inc
+++ b/ldapdump/addons/ldapdump/class_ldapDump.inc
@@ -60,7 +60,7 @@ class ldapDump extends simplePlugin
       $ui = get_userinfo();
       if (preg_match('/r/', $ui->get_complete_category_acls($this->acl_base, $this->parent->acl_category))) {
         $ldap = $config->get_ldap_link();
-        $ldap->cat($this->dn);
+        $ldap->cat($this->dn, array('*','createTimestamp','modifyTimestamp'));
         if ($attrs = $ldap->fetch()) {
           $this->dump = array($this->dumpLdapNode($attrs, $config->current['BASE']));
         } else {
@@ -86,13 +86,28 @@ class ldapDump extends simplePlugin
     );
     for ($i = 0; $i < $attrs['count']; $i++) {
       $key                  = $attrs[$i];
+      if (in_array($key, array('createTimestamp', 'modifyTimestamp'))) {
+        continue;
+      }
       $node['attrs'][$key]  = $attrs[$key];
       unset($node['attrs'][$key]['count']);
     }
+    $timestamps = array();
+    if (isset($attrs['createTimestamp'][0])) {
+      $date = LdapGeneralizedTime::fromString($attrs['createTimestamp'][0]);
+      $date->setTimezone(timezone::getDefaultTimeZone());
+      $timestamps['createTimestamp'] = $date->format('Y-m-d H:i:s');
+    }
+    if (isset($attrs['modifyTimestamp'][0])) {
+      $date = LdapGeneralizedTime::fromString($attrs['modifyTimestamp'][0]);
+      $date->setTimezone(timezone::getDefaultTimeZone());
+      $timestamps['modifyTimestamp'] = $date->format('Y-m-d H:i:s');
+    }
+    $node['attrs'] = $timestamps + $node['attrs'];
 
     $ldap = $config->get_ldap_link();
     $ldap->cd($attrs['dn']);
-    $ldap->ls();
+    $ldap->search('(objectClass=*)', array('*','createTimestamp','modifyTimestamp'), 'one');
     while ($attrs = $ldap->fetch()) {
       $node['subnodes'][$attrs['dn']] = $this->dumpLdapNode($attrs, $node['dn']);
     }
diff --git a/ldapdump/locale/ar/fusiondirectory.po b/ldapdump/locale/ar/fusiondirectory.po
index 36797a323402caaeddda3f4d014e00bd781cb9ea..aee994c0b77d106d1d6e0869a088d997e37479a9 100644
--- a/ldapdump/locale/ar/fusiondirectory.po
+++ b/ldapdump/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/ca/fusiondirectory.po b/ldapdump/locale/ca/fusiondirectory.po
index 6314e5846f6bea8edd755035d189bb0d7f6b64d7..ff2f424a36a643deaf5d62d4502403828c299cfa 100644
--- a/ldapdump/locale/ca/fusiondirectory.po
+++ b/ldapdump/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/cs_CZ/fusiondirectory.po b/ldapdump/locale/cs_CZ/fusiondirectory.po
index 9e2923702d14f70414c1b63248a521800fc3bb77..afb0be18415fa508c78f0fe4eb77c5d0df21b547 100644
--- a/ldapdump/locale/cs_CZ/fusiondirectory.po
+++ b/ldapdump/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/de/fusiondirectory.po b/ldapdump/locale/de/fusiondirectory.po
index affc1fa6eae0be7c3b06a00221cdbf1a0e81b5a8..92f04088a27326848139be82ae49701cca033ac0 100644
--- a/ldapdump/locale/de/fusiondirectory.po
+++ b/ldapdump/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/el_GR/fusiondirectory.po b/ldapdump/locale/el_GR/fusiondirectory.po
index 5a9695681448fdb55b60b7025c37ec41a3a961a4..ff7a4e0c879746efdf865336a643a076ff38aa5c 100644
--- a/ldapdump/locale/el_GR/fusiondirectory.po
+++ b/ldapdump/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/en/fusiondirectory.po b/ldapdump/locale/en/fusiondirectory.po
index 61456572ec2083978e5821ede95659dcfd230d27..42f3ab171fb07efe71973361006f7633cedd0a1f 100644
--- a/ldapdump/locale/en/fusiondirectory.po
+++ b/ldapdump/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/ldapdump/locale/es/fusiondirectory.po b/ldapdump/locale/es/fusiondirectory.po
index e1c084bec2d3787d33a154a32e19ad187472976f..82266b82b54db3627c50a15feeeda6edec7ad793 100644
--- a/ldapdump/locale/es/fusiondirectory.po
+++ b/ldapdump/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/es_CO/fusiondirectory.po b/ldapdump/locale/es_CO/fusiondirectory.po
index 406d39a1139d41afbc6c6b465316ca2e23c81774..dbd71bf794a7e957294dd36e5904e72fc8c93847 100644
--- a/ldapdump/locale/es_CO/fusiondirectory.po
+++ b/ldapdump/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/es_VE/fusiondirectory.po b/ldapdump/locale/es_VE/fusiondirectory.po
index f8191019fee08c6ee99f0b5e4a5e2fcad9463530..50adb0d5c717a815acdabacbea78babd2abea768 100644
--- a/ldapdump/locale/es_VE/fusiondirectory.po
+++ b/ldapdump/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/fa_IR/fusiondirectory.po b/ldapdump/locale/fa_IR/fusiondirectory.po
index 58c0868fc8030ec2e417e2e5ce672bea969a3ce6..eab989635d22d1aa72f0dce5df7b153035327ea7 100644
--- a/ldapdump/locale/fa_IR/fusiondirectory.po
+++ b/ldapdump/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/fi_FI/fusiondirectory.po b/ldapdump/locale/fi_FI/fusiondirectory.po
index 5381b30f7ebccd200e0d705a73571d2b44c0d27e..5012433ac93a02b1b5dca55822c8ccfac6fb1335 100644
--- a/ldapdump/locale/fi_FI/fusiondirectory.po
+++ b/ldapdump/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/fr/fusiondirectory.po b/ldapdump/locale/fr/fusiondirectory.po
index 37e7dcc89e4da9184a9834632e7af16a3141466e..26e39ee8c7ba1a130840f556ab035c4604ff683d 100644
--- a/ldapdump/locale/fr/fusiondirectory.po
+++ b/ldapdump/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +24,8 @@ msgstr "LDAP"
 
 #: addons/ldapdump/class_ldapDump.inc:27 addons/ldapdump/class_ldapDump.inc:39
 msgid "LDAP Dump"
-msgstr "Vue LDAP"
+msgstr "Vue technique du LDAP"
 
 #: addons/ldapdump/ldapdump.tpl.c:2
 msgid "Insufficient rights"
-msgstr "Permissions insuffisantes"
+msgstr "Droits insuffisants"
diff --git a/ldapdump/locale/hu_HU/fusiondirectory.po b/ldapdump/locale/hu_HU/fusiondirectory.po
index 8d209d72ae8f44711e110cf6734d806675ce702a..264b649f883e1b87e2c9495fa04b9355a9dd2175 100644
--- a/ldapdump/locale/hu_HU/fusiondirectory.po
+++ b/ldapdump/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/id/fusiondirectory.po b/ldapdump/locale/id/fusiondirectory.po
index 2510e06672e7f1c078017e9f198f144abbd8eb29..b0d366b53e8a96728b16a8a0ff1de69e7dc94345 100644
--- a/ldapdump/locale/id/fusiondirectory.po
+++ b/ldapdump/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/it_IT/fusiondirectory.po b/ldapdump/locale/it_IT/fusiondirectory.po
index 4770339d9f0a80adb7e1b0f46767c59d145fa33f..6e67d7fd4246dda8339e48afd0d18825a35fc0a7 100644
--- a/ldapdump/locale/it_IT/fusiondirectory.po
+++ b/ldapdump/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/lv/fusiondirectory.po b/ldapdump/locale/lv/fusiondirectory.po
index faa301ad5de8b5211be66bdd93bb79fe8f69591a..8b1d8657c3af83e6849931277632ac34768805fe 100644
--- a/ldapdump/locale/lv/fusiondirectory.po
+++ b/ldapdump/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/nb/fusiondirectory.po b/ldapdump/locale/nb/fusiondirectory.po
index 2f6dcfc5e5a2c78e23c637ca7bec6043a832b0f0..21d090b725b04841a53a5d266bf10220c3bd57f1 100644
--- a/ldapdump/locale/nb/fusiondirectory.po
+++ b/ldapdump/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/nl/fusiondirectory.po b/ldapdump/locale/nl/fusiondirectory.po
index ac9932fd93750df4e87dc2c4444f93ce1b1718e1..ad0279bc6ec0378d51b4a7d62cd4a703c1d65a09 100644
--- a/ldapdump/locale/nl/fusiondirectory.po
+++ b/ldapdump/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,4 +28,4 @@ msgstr ""
 
 #: addons/ldapdump/ldapdump.tpl.c:2
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Onvoldoende rechten"
diff --git a/ldapdump/locale/pl/fusiondirectory.po b/ldapdump/locale/pl/fusiondirectory.po
index b28b30cc0192fbeea6225c08982e180ee09b3c9b..a78b779b83c84a6969b3f597b20f2ae6f9d7bb60 100644
--- a/ldapdump/locale/pl/fusiondirectory.po
+++ b/ldapdump/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/pt/fusiondirectory.po b/ldapdump/locale/pt/fusiondirectory.po
index fdf94fd9bc94591bcddae2f766ee1503df9a170b..08f3535ebd8d94e94088cc301cb8e4e85c8fc91a 100644
--- a/ldapdump/locale/pt/fusiondirectory.po
+++ b/ldapdump/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/pt_BR/fusiondirectory.po b/ldapdump/locale/pt_BR/fusiondirectory.po
index 6b12f0f30d3d184a98f6773aec68ceaf9556c888..92c9b50fa50d582c98874f65f057746fde290f2d 100644
--- a/ldapdump/locale/pt_BR/fusiondirectory.po
+++ b/ldapdump/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/ru/fusiondirectory.po b/ldapdump/locale/ru/fusiondirectory.po
index 8b82d71dc5e0147e345c9c460037efdaac1d43b4..f97d7fa681425d97f8c2d9bc0dc7163c4706751a 100644
--- a/ldapdump/locale/ru/fusiondirectory.po
+++ b/ldapdump/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/ru@petr1708/fusiondirectory.po b/ldapdump/locale/ru@petr1708/fusiondirectory.po
index 361d35d0011e996c25ac2dc371ea362d85ec1373..65b60d7110d55d4517e3b5199c2c4c5ecb5a4887 100644
--- a/ldapdump/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapdump/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/sv/fusiondirectory.po b/ldapdump/locale/sv/fusiondirectory.po
index ee1d42057604fa292a333fb4a1ed13c1de08966a..15dae3f46c983ec950139fb5fdb102818aefdd3d 100644
--- a/ldapdump/locale/sv/fusiondirectory.po
+++ b/ldapdump/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/ug/fusiondirectory.po b/ldapdump/locale/ug/fusiondirectory.po
index c1b9976a0031d63e0cc6da940753311bb12cd807..9307104f552d83d086d805701c5a9518e4a4edee 100644
--- a/ldapdump/locale/ug/fusiondirectory.po
+++ b/ldapdump/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/vi_VN/fusiondirectory.po b/ldapdump/locale/vi_VN/fusiondirectory.po
index a37791a8f76533a0022b3a975e09280cb2562b54..277090fc7d03fcd41c57e0e4317e8898ea30764b 100644
--- a/ldapdump/locale/vi_VN/fusiondirectory.po
+++ b/ldapdump/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapdump/locale/zh/fusiondirectory.po b/ldapdump/locale/zh/fusiondirectory.po
index 4b16125e025972750a032a69c99d7cbfb1aa593a..131dd0c8ffd2886ca304974cfa8b6008dbd66296 100644
--- a/ldapdump/locale/zh/fusiondirectory.po
+++ b/ldapdump/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ldapmanager/addons/ldapmanager/class_csvimport.inc b/ldapmanager/addons/ldapmanager/class_csvimport.inc
index ebcebfc4a2e39e46d79892d7d5235731ebe566c1..2eb0fc62fdce113f7945981c04cb6f758aa999a7 100644
--- a/ldapmanager/addons/ldapmanager/class_csvimport.inc
+++ b/ldapmanager/addons/ldapmanager/class_csvimport.inc
@@ -115,19 +115,21 @@ class csvimport extends simplePlugin
     parent::__construct($dn, $object, $parent, $mainTab);
     $this->attributesAccess['type']->setSubmitForm('typeChanged');
     $choices  = array();
-    $outputs  = array();
     $types    = objects::types();
     foreach ($types as $type) {
       if (in_array($type, departmentManagement::getDepartmentTypes())) {
         continue;
       }
       $infos = objects::infos($type);
-      if (isset($infos['management'])) {
-        $choices[] = $type;
-        $outputs[] = $infos['name'];
+      if ($infos['templateActive']) {
+        $choices[$type] = $infos['name'];
       }
     }
-    $this->attributesAccess['type']->setChoices($choices, $outputs);
+    asort($choices);
+    $this->attributesAccess['type']->setChoices(array_keys($choices), array_values($choices));
+    /* People usually import users, so set it as default */
+    $this->attributesAccess['type']->setDefaultValue('USER');
+    $this->attributesAccess['type']->resetToDefault();
     $this->attributesAccess['import_submit_fields']->setDisabled(TRUE);
   }
 
@@ -150,7 +152,6 @@ class csvimport extends simplePlugin
     $this->template_object = new template($this->type, $this->template_dn);
 
     /* Add nonrequired field filling feature */
-    $attributes = array();
     $fields = array();
     if (isset($this->csv_data[0])) {
       foreach ($this->csv_data[0] as $key => $field_value) {
@@ -244,13 +245,12 @@ class csvimport extends simplePlugin
       $this->template_object->reset();
       $this->template_object->deserialize($values);
       $tabObject = $this->template_object->apply();
-      $msgs = $tabObject->check();
+      $msgs = $tabObject->save();
       if (count($msgs)) {
         $msg = '<ul><li>'.implode('</li><li>', $msgs).'</li></ul>';
         msg_dialog::display(sprintf(_('Import failed for line %d'), $rownumber), $msg, ERROR_DIALOG);
         break;
       } else {
-        $tabObject->save();
         $success++;
       }
     }
@@ -273,7 +273,7 @@ class csvimport extends simplePlugin
     }
     if (is_array($i)) {
       $value = array();
-      foreach ($i as $k => $j) {
+      foreach ($i as $j) {
         $value[] = $this->compute_attribute_value($attribute, $row, $j);
       }
       return $value;
diff --git a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
index 607b3df2dbc44f2b593e73ac24eb6ef75b200010..d09d6f216f9960d95ad6a42ed827166f790ebf94 100644
--- a/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
+++ b/ldapmanager/addons/ldapmanager/class_ldapmanager.inc
@@ -56,7 +56,6 @@ class ldapmanager extends simplePlugin
 
   static function getAttributesInfo ()
   {
-    global $config;
     return array(
       'export' => array(
         'name'  => _('Export'),
@@ -152,7 +151,7 @@ class ldapmanager extends simplePlugin
     $acl  = $this->attributesAccess['single_export']->getAcl();
     if (!$ldap->dn_exists($dn)) {
       msg_dialog::display(_('LDAP error'),
-          sprintf(_('No such object %s!'), LDAP::fix($dn)),
+          sprintf(_('No such object %s!'), $dn),
           ERROR_DIALOG);
       $dn = '';
     }
@@ -168,16 +167,16 @@ class ldapmanager extends simplePlugin
   function save_export($dn, $acl, $scope, $name)
   {
     global $config;
+    // An LDIF export was asked
     if (!empty($dn)) {
-      /* An LDIF export was asked */
-      /* Check permissions */
+      // Check permissions
       if (!$this->acl_is_writeable($acl, $this->acl_skip_write())) {
         msg_dialog::display(_('Permission error'),
-            sprintf(_('You have no permission to export %s!'), bold(LDAP::fix($dn))),
+            sprintf(_('You have no permission to export %s!'), bold($dn)),
             ERROR_DIALOG);
       } else {
         $ldap = $config->get_ldap_link();
-        $data = $ldap->generateLdif(LDAP::fix($dn), $this->export_filter, $scope);
+        $data = $ldap->generateLdif($dn, $this->export_filter, $scope);
         if ($data === NULL) {
           msg_dialog::display(_('Error'),
               sprintf(_('Failed to generate ldap export, error was "%s"!'), $ldap->get_error()),
@@ -195,7 +194,7 @@ class ldapmanager extends simplePlugin
     $ldap = $config->get_ldap_link();
     try {
       $ldap->import_complete_ldif($this->import, !$this->overwrite, FALSE);
-    } catch (Exception $e) {
+    } catch (FusionDirectoryException $e) {
       msg_dialog::display(_('LDAP error'), $e->getMessage(), ERROR_DIALOG);
     }
   }
@@ -210,5 +209,4 @@ class ldapmanager extends simplePlugin
     return $config->idepartments;
   }
 }
-
 ?>
diff --git a/ldapmanager/locale/ar/fusiondirectory.po b/ldapmanager/locale/ar/fusiondirectory.po
index ac80b69d1e2929e7b2d05f756703a6aa5cb2ab99..1d535509b555a3c95105b656aed6a065642b6a81 100644
--- a/ldapmanager/locale/ar/fusiondirectory.po
+++ b/ldapmanager/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 2ba068ca4695f09c350548d699466d59bf76bc71..0bd773b178bf6fd7c3e5edee6257007ac3c49c15 100644
--- a/ldapmanager/locale/ca/fusiondirectory.po
+++ b/ldapmanager/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 e49d48ec2279c044cca89c52dfc287504594db9a..ece1b9a6bdaf315b0b97127139cb8f9404894718 100644
--- a/ldapmanager/locale/cs_CZ/fusiondirectory.po
+++ b/ldapmanager/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
-msgstr "Import/export LDAP"
+msgstr "import/export LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:32
 msgid "Allows the import or export of the ldap tree"
@@ -27,11 +28,11 @@ msgstr "UmoÅ¾Åˆuje importovat Äi exportovat ldap strom"
 
 #: addons/ldapmanager/tabs_ldif.inc:36
 msgid "Ldap manager"
-msgstr "sprÃ¡vce LDAP"
+msgstr "sprÃ¡vce LDAPu"
 
 #: addons/ldapmanager/class_csvimport.inc:29
 msgid "CSV import"
-msgstr "Import CSV"
+msgstr "import(ovat) CSV"
 
 #: addons/ldapmanager/class_csvimport.inc:30
 msgid "Import of csv data into the ldap tree"
@@ -51,7 +52,7 @@ msgstr "Typ objektÅ¯, kterÃ© chcete importovat"
 
 #: addons/ldapmanager/class_csvimport.inc:52
 msgid "Template"
-msgstr "Å ablona"
+msgstr "Å¡ablona"
 
 #: addons/ldapmanager/class_csvimport.inc:52
 msgid "Select a template to apply to imported entries"
@@ -80,15 +81,16 @@ msgstr "NemÄ›nnÃ© hodnoty"
 #: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
-msgstr "NÄ›kterÃ© nemÄ›nnÃ© hodnoty kterÃ© by se mohly hodit pÅ™i vyplÅˆovÃ¡nÃ Å¡ablony."
+msgstr ""
+"NÄ›kterÃ© nemÄ›nnÃ© hodnoty kterÃ© by se mohly hodit pÅ™i vyplÅˆovÃ¡nÃ Å¡ablony."
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
-msgstr "Import"
+msgstr "import(ovat)"
 
 #: addons/ldapmanager/class_csvimport.inc:85
 msgid "Template filling"
@@ -98,14 +100,14 @@ msgstr "VyplÅˆovÃ¡nÃ Å¡ablony"
 msgid "Select fields associations"
 msgstr "Vyberte pÅ™iÅ™azenÃ polÃÄek"
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:258
 msgid "Success"
-msgstr "ÃšspÄ›ch"
+msgstr "ÃºspÄ›ch"
 
 #: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
@@ -124,86 +126,91 @@ msgstr "Exportovat/importovat ldap strom do/z LDIF formÃ¡tu"
 msgid "LDAP Manager"
 msgstr "SprÃ¡vce LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
-msgstr "Export"
+msgstr "export(ovat)"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr "RozliÅ¡enÃ½ nÃ¡zev poloÅ¾ky, kterÃ¡ mÃ¡ bÃ½t samostatnÄ› exportovÃ¡na do ldif"
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
-msgstr "Exportovat jedinou poloÅ¾ku"
+msgstr "exportovat jedinou poloÅ¾ku"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
-msgstr "Filtr"
+msgstr "filtr"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr "Filtr, kterÃ½ pouÅ¾Ãt pro vÃ½bÄ›r objektÅ¯ k exportu"
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr "StÃ¡hnout si ve formÃ¡tu ldiff ÃºplnÃ½ zachycenÃ½ stav pouÅ¾ÃvanÃ©ho LDAP adresÃ¡Å™e tohoto zÃ¡kladu"
+msgstr ""
+"StÃ¡hnout si ve formÃ¡tu ldiff ÃºplnÃ½ zachycenÃ½ stav pouÅ¾ÃvanÃ©ho LDAP adresÃ¡Å™e "
+"tohoto zÃ¡kladu"
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
-msgstr "Exportovat ÃºplnÃ½ LDIF pro"
+msgstr "exportovat ÃºplnÃ½ LDIF pro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "Importovat LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "PÅ™epsat existujÃcÃ poloÅ¾ky"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr "Odebrat z LDAP poloÅ¾ky, kterÃ© jsou navÃc oproti tomu, co je v LDIF."
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr "Import LDIF souboru do tÃ©to LDAP databÃ¡ze. MÄ›jte na pamÄ›ti, Å¾e FusionDirectory nebude ovÄ›Å™ovat vaÅ¡e LDIF data, zda jsou vhodnÃ¡ pro FusionDirectory."
+msgstr ""
+"Import LDIF souboru do tÃ©to LDAP databÃ¡ze. MÄ›jte na pamÄ›ti, Å¾e "
+"FusionDirectory nebude ovÄ›Å™ovat vaÅ¡e LDIF data, zda jsou vhodnÃ¡ pro "
+"FusionDirectory."
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr "Importovat LDIF soubor"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s neexistuje!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
-msgstr "Chyba oprÃ¡vnÄ›nÃ"
+msgstr "chyba oprÃ¡vnÄ›nÃ"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
-msgstr "Nejste oprÃ¡vnÄ›ni exportovat %s!"
+msgstr "Nejste oprÃ¡vnÄ›n(a) exportovat %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "VytvoÅ™enÃ ldap exportu se nezdaÅ™ilo, chyba je v %s!"
@@ -214,7 +221,11 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "ZÃ¡suvnÃ½ modul CSV import poskytuje metody, jak vytvÃ¡Å™et uÅ¾ivatelskÃ© ÃºÄty ze souboru, obsahujÃcÃho hodnoty oddÄ›lenÃ© stÅ™ednÃky. SprÃ¡vce mÅ¯Å¾e rozhodnout, kterÃ© sloupce by mÄ›ly bÃ½t pÅ™eneseny do kterÃ½ch atributÅ¯. Poznamenejme, Å¾e je tÅ™eba zde mÃt nastaveno alespoÅˆ JMÃ‰NO a PÅ˜ÃJMENÃ."
+msgstr ""
+"ZÃ¡suvnÃ½ modul CSV import poskytuje metody, jak vytvÃ¡Å™et uÅ¾ivatelskÃ© ÃºÄty ze "
+"souboru, obsahujÃcÃho hodnoty oddÄ›lenÃ© stÅ™ednÃky. SprÃ¡vce mÅ¯Å¾e rozhodnout, "
+"kterÃ© sloupce by mÄ›ly bÃ½t pÅ™eneseny do kterÃ½ch atributÅ¯. Poznamenejme, Å¾e je"
+" tÅ™eba zde mÃt nastaveno alespoÅˆ JMÃ‰NO a PÅ˜ÃJMENÃ."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/de/fusiondirectory.po b/ldapmanager/locale/de/fusiondirectory.po
index 7de6725e4abf5b09c17ee6bd56fae55ec51fdcc0..df0377684070c8ec83375f2564c87167336ba3dd 100644
--- a/ldapmanager/locale/de/fusiondirectory.po
+++ b/ldapmanager/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -125,86 +125,86 @@ msgstr "LDAP-Baum ins/vom LDIF-Format exportieren/importieren"
 msgid "LDAP Manager"
 msgstr "LDAP Manager"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Export"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exportiere einzelnen Eintrag"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Exportiere vollstÃ¤ndige LDIF-Datei fÃ¼r"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "LDIF importieren"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "Vorhandene EintrÃ¤ge Ã¼berschreiben"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr "LDIF-Datei importieren"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "Objekt %s nicht gefunden!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Sie haben keine Berechtigung, um %s zu exportieren!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -215,7 +215,12 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "Das CSV-Importplugin bietet Methoden um Benutzerkonten von einer Datei zu erstellen. Diese Datei sollte Semikolon-getrennte Werte haben. Der Administrator kann sich entscheiden, welche Spalten zu welchem Attribut transferiert werden. Beachten Sie dass Sie mindestes den VORNAMEN und NACHNAMEN als Set haben mÃ¼ssen."
+msgstr ""
+"Das CSV-Importplugin bietet Methoden um Benutzerkonten von einer Datei zu "
+"erstellen. Diese Datei sollte Semikolon-getrennte Werte haben. Der "
+"Administrator kann sich entscheiden, welche Spalten zu welchem Attribut "
+"transferiert werden. Beachten Sie dass Sie mindestes den VORNAMEN und "
+"NACHNAMEN als Set haben mÃ¼ssen."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/el_GR/fusiondirectory.po b/ldapmanager/locale/el_GR/fusiondirectory.po
index 6af439f697b16bdd33398d81752b46dde1dd3758..39ec89a7d1eb0b4e03a74a374248b16b6de08966 100644
--- a/ldapmanager/locale/el_GR/fusiondirectory.po
+++ b/ldapmanager/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,7 +56,8 @@ msgstr "Î ÏÏŒÏ„Ï…Ï€Î¿"
 
 #: addons/ldapmanager/class_csvimport.inc:52
 msgid "Select a template to apply to imported entries"
-msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÎµÎ½ÏŒÏ‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… Î±Ï€ÏŒ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± ÎµÏ†ÏÎ±Î¼Î¿ÏƒÏ„Î¿ÏÎ½ Î¿Î¹ ÎµÎ¹ÏƒÎ·Î³Î¼ÎÎ½ÎµÏ‚ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚"
+msgstr ""
+"Î•Ï€Î¹Î»Î¿Î³Î® ÎµÎ½ÏŒÏ‚ Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï… Î±Ï€ÏŒ Ï„Î¿ Î¿Ï€Î¿Î¯Î¿ Î¸Î± ÎµÏ†ÏÎ±Î¼Î¿ÏƒÏ„Î¿ÏÎ½ Î¿Î¹ ÎµÎ¹ÏƒÎ·Î³Î¼ÎÎ½ÎµÏ‚ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚"
 
 #: addons/ldapmanager/class_csvimport.inc:58
 msgid "CSV file"
@@ -85,7 +86,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -99,7 +100,7 @@ msgstr "Î“ÎÎ¼Î¹ÏƒÎ¼Î± Ï€ÏÎ¿Ï„ÏÏ€Ï‰Î½"
 msgid "Select fields associations"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏƒÏ…ÏƒÏ‡ÎµÏ„Î¹ÏƒÎ¼ÏŽÎ½ Ï€ÎµÎ´Î¯Ï‰Î½"
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -125,86 +126,87 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Î•Î¾Î±Î³Ï‰Î³Î®"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Î•Î¾Î±Î³Ï‰Î³Î® Î¼Î¿Î½Î®Ï‚ ÎºÎ±Ï„Î±Ï‡ÏŽÏÎ·ÏƒÎ·Ï‚"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Î¦Î¯Î»Ï„ÏÎ¿"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
-msgstr "Î¦Î¯Î»Ï„ÏÎ¿ Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½ Î³Î¹Î± ÎµÎ¾Î±Î³Ï‰Î³Î®"
+msgstr ""
+"Î¦Î¯Î»Ï„ÏÎ¿ Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½ Î³Î¹Î± ÎµÎ¾Î±Î³Ï‰Î³Î®"
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Î•Î¾Î±Î³Ï‰Î³Î® Ï€Î»Î®ÏÎ¿Ï…Ï‚ LDIF Î³Î¹Î±"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "Î‘Î½Ï„Î¹ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï…Ï€Î¬ÏÏ‡Î¿Ï…ÏƒÏ‰Î½ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ¯ÏƒÎµÏ‰Î½"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï… LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„ÎÏ„Î¿Î¹Î¿Ï‚ Î±Î½Ï„Î¹ÎºÎµÎ¯Î¼ÎµÎ½Î¿ %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
-msgstr "Î£Ï†Î¬Î»Î¼Î± Î¬Î´ÎµÎ¹Î±Ï‚"
+msgstr "Î£Ï†Î¬Î»Î¼Î± Î´Î¹ÎºÎ±Î¹Ï‰Î¼Î¬Ï„Ï‰Î½"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Î”ÎµÎ½ ÎÏ‡ÎµÏ„Îµ Î¬Î´ÎµÎ¹Î± Î³Î¹Î± ÎµÎ¾Î±Î³Ï‰Î³Î® %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ ÎµÎ¾Î±Î³Ï‰Î³Î®Ï‚ ldap, Ï„Î¿ ÏƒÏ†Î¬Î»Î¼Î± Î®Ï„Î±Î½ \"%s\"!"
@@ -231,7 +233,8 @@ msgstr "Î•Ï€Î¹Î»Î¿Î³Î® Ï€ÏÎ¿Ï„ÏÏ€Î¿Ï…"
 
 #: addons/ldapmanager/contentcsv.tpl.c:14
 msgid "All entries have been written to the LDAP database successfully."
-msgstr "ÎŒÎ»ÎµÏ‚ Î¿Î¹ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏÏ„Î·ÎºÎ±Î½ ÏƒÏ„Î·Î½ Î²Î¬ÏƒÎ· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ LDAP Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±."
+msgstr ""
+"ÎŒÎ»ÎµÏ‚ Î¿Î¹ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ®ÏƒÎµÎ¹Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏÏ„Î·ÎºÎ±Î½ ÏƒÏ„Î·Î½ Î²Î¬ÏƒÎ· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ LDAP Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±."
 
 #: addons/ldapmanager/contentcsv.tpl.c:17
 msgid "Oups. There was an error during the import of your data."
diff --git a/ldapmanager/locale/en/fusiondirectory.po b/ldapmanager/locale/en/fusiondirectory.po
index c70296c23c3c0f845e2d2798e674515a01ef4be5..654bbfdd319fdd276d5da135f09c93a7221561c8 100644
--- a/ldapmanager/locale/en/fusiondirectory.po
+++ b/ldapmanager/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +124,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/ldapmanager/locale/es/fusiondirectory.po b/ldapmanager/locale/es/fusiondirectory.po
index 46caf13c9386d671fe69ae5b21f09258b37c8e2a..56a48ca71d9075b65c58d6640f1d7a735454b79d 100644
--- a/ldapmanager/locale/es/fusiondirectory.po
+++ b/ldapmanager/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Exportar"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exportar solo esta entrada"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "ExportaciÃ³n del LDIF completada para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -214,7 +215,12 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "El complemento de importado de CSV provee metodos para generar cuentas de usuario a partir de un archivo que contiene Valores Separados por Punto y Coma. El administrador puede decidir cuales columnas son transferidas a cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de NOMBRE y APELLIDO"
+msgstr ""
+"El complemento de importado de CSV provee metodos para generar cuentas de "
+"usuario a partir de un archivo que contiene Valores Separados por Punto y "
+"Coma. El administrador puede decidir cuales columnas son transferidas a "
+"cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de "
+"NOMBRE y APELLIDO"
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
@@ -230,7 +236,8 @@ msgstr "Selecciona plantilla"
 
 #: addons/ldapmanager/contentcsv.tpl.c:14
 msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+msgstr ""
+"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
 
 #: addons/ldapmanager/contentcsv.tpl.c:17
 msgid "Oups. There was an error during the import of your data."
diff --git a/ldapmanager/locale/es_CO/fusiondirectory.po b/ldapmanager/locale/es_CO/fusiondirectory.po
index faae38dc60759c8bc0667ccd302f41d39b8d1d11..d78b1adad63f8487d0dedf25e93b677200f51970 100644
--- a/ldapmanager/locale/es_CO/fusiondirectory.po
+++ b/ldapmanager/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 fc2f01839256f1a43df4af8984cf6b71d44dde64..d583ee3cc94344cad0d58d0477955fe3d7553672 100644
--- a/ldapmanager/locale/es_VE/fusiondirectory.po
+++ b/ldapmanager/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Exportar"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exportar solo esta entrada"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Exportar  LDIF completo para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "No existe el objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "No tiene permiso para exportar %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Error"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -214,7 +215,12 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "El complemento de importado de CSV provee metodos para generar cuentas de usuario a partir de un archivo que contiene Valores Separados por Punto y Coma. El administrador puede decidir cuales columnas son transferidas a cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de NOMBRE y APELLIDO"
+msgstr ""
+"El complemento de importado de CSV provee metodos para generar cuentas de "
+"usuario a partir de un archivo que contiene Valores Separados por Punto y "
+"Coma. El administrador puede decidir cuales columnas son transferidas a "
+"cuales atributos. Tome en cuenta que debe tener como minimo el conjunto de "
+"NOMBRE y APELLIDO"
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
@@ -230,7 +236,8 @@ msgstr "Selecciona plantilla"
 
 #: addons/ldapmanager/contentcsv.tpl.c:14
 msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+msgstr ""
+"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
 
 #: addons/ldapmanager/contentcsv.tpl.c:17
 msgid "Oups. There was an error during the import of your data."
diff --git a/ldapmanager/locale/fa_IR/fusiondirectory.po b/ldapmanager/locale/fa_IR/fusiondirectory.po
index 8986778e1638173fef52875a34c57ed4022a8e44..9b58dc465461fa68eb0d6c9456cb25ad44e11a3d 100644
--- a/ldapmanager/locale/fa_IR/fusiondirectory.po
+++ b/ldapmanager/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 63a92f135b455957415c8fcfca176b2aaa1d0da6..98cb76a6f4c18929be139e925b3f86224e475a58 100644
--- a/ldapmanager/locale/fi_FI/fusiondirectory.po
+++ b/ldapmanager/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Virhe"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 0231b2ddf0073898faf3ce016c1e91ff21c15705..bcb3dd3177b22b0b5bc1b300d294192833283f56 100644
--- a/ldapmanager/locale/fr/fusiondirectory.po
+++ b/ldapmanager/locale/fr/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,23 +20,25 @@ msgstr ""
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
-msgstr "Import/Export LDAP"
+msgstr "Import / Export LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:32
 msgid "Allows the import or export of the ldap tree"
-msgstr "Permet d'importer ou exporter des parties de lâ€™annuaire LDAP"
+msgstr ""
+"Cette extension vous permet d'importer ou exporter des parties de votre "
+"annuaire LDAP"
 
 #: addons/ldapmanager/tabs_ldif.inc:36
 msgid "Ldap manager"
-msgstr "Gestion LDAP"
+msgstr "GÃ©rer l'annuaire LDAP"
 
 #: addons/ldapmanager/class_csvimport.inc:29
 msgid "CSV import"
-msgstr "Import CSV"
+msgstr "Importation CSV"
 
 #: addons/ldapmanager/class_csvimport.inc:30
 msgid "Import of csv data into the ldap tree"
-msgstr "Importer des donnÃ©es CSV dans votre annuaire LDAP"
+msgstr "importer des donnÃ©es CVS dans votre annuaire ldap"
 
 #: addons/ldapmanager/class_csvimport.inc:43
 msgid "Import CSV"
@@ -83,11 +83,13 @@ msgstr "Valeurs fixes"
 #: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
-msgstr "Certaines valeurs fixes que vous voulez utiliser dans le remplissage du modÃ¨le."
+msgstr ""
+"Certaines valeurs fixes que vous voulez utiliser dans le remplissage du "
+"modÃ¨le."
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -101,14 +103,14 @@ msgstr "Remplissage du modÃ¨le"
 msgid "Select fields associations"
 msgstr "SÃ©lectionnez l'association des champs"
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr "L'importation Ã  Ã©chouÃ© pour la ligne %d"
 
 #: addons/ldapmanager/class_csvimport.inc:258
 msgid "Success"
-msgstr "SuccÃ¨s"
+msgstr "RÃ©ussi"
 
 #: addons/ldapmanager/class_csvimport.inc:258
 #, php-format
@@ -121,95 +123,102 @@ msgstr "LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:46
 msgid "Export/Import the ldap tree to/from LDIF format"
-msgstr "Exporter/importer l'annuaire LDAP au format LDIF"
+msgstr "Exporter l'annuaire ldap sous format ldif"
 
 #: addons/ldapmanager/class_ldapmanager.inc:48
 msgid "LDAP Manager"
-msgstr "Gestion LDAP"
+msgstr "GÃ©rer l'annuaire"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Exporter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr "DN d'une entrÃ©e Ã  exporter comme ldif"
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exporter une seule entrÃ©e"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtre"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
-msgstr "Filtre Ã  utiliser pour sÃ©lectionner les objets Ã  exporter"
+msgstr "Filtre a utiliser pour sÃ©lectionner les objets Ã  exporter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr "TÃ©lÃ©charger un instantanÃ© complet de l'annuaire LDAP au format LDIF"
+msgstr "Telecharger un snapshot complet de l'annuaire LDAP "
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
-msgstr "Exporter un LDIF complet pour "
+msgstr "Exporter un fichier LDIF complet pour "
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "Import LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "Ã‰craser les entrÃ©es existantes"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
-msgstr "Retirer les champs qui ne sont pas dans le LDIF de l'annuaire si ils existaient."
+msgstr ""
+"Enlever les entrÃ©es qui ne sont pas dans le LDIF de l'annuaire si elles "
+"existaient"
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr "Importer un fichier LDIF dans votre annuaire. Souvenez vous que FusionDirectory ne vÃ©rifiera pas si votre fichier est conforme aux besoins de FusionDirectory ."
+msgstr ""
+"Importer un fichier LDIF dans votre annuaire. Souvenez vous que "
+"FusionDirectory ne vÃ©rifiera pas si votre fichier est conforme au besoin de "
+"FusionDirectory "
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
-msgstr "Importer un fichier LDIF"
+msgstr "Importation d'un fichier LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
-msgstr "Objet '%s' non trouvÃ©â€¯!"
+msgstr "Pas d'objet '%s' !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
-msgstr "Erreur de permission"
+msgstr "Erreur de permissions"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
-msgstr "Ã‰chec de lâ€™exportation de votre annuaire LDAP, l'erreur est '%s'â€¯!"
+msgstr ""
+"Ã‰chec de la crÃ©ation d'une exportation de votre annuaire ldap, l'erreur est "
+"'%s' !"
 
 #: addons/ldapmanager/contentcsv.tpl.c:2
 msgid ""
@@ -217,7 +226,11 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "Le plugin dâ€™import CSV permet de gÃ©nÃ©rer des comptes utilisateurs depuis un fichier contenant des valeurs sÃ©parÃ©es par des points virgules. L'administrateur peut choisir quelle colonnes doivent Ãªtre transfÃ©rÃ©es vers quel attribut. Notez que vous devez au moins fournir le Nom et PrÃ©nom."
+msgstr ""
+"Le plugin dâ€™import CSV permet de gÃ©nÃ©rer des comptes utilisateurs depuis un "
+"fichier contenant des valeurs sÃ©parÃ©es par des points virgules. "
+"L'administrateur peut choisir quelle colonnes doivent Ãªtre transfÃ©rÃ©es vers "
+"quel attribut. Notez que vous devez au moins fournir le Nom et PrÃ©nom."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/hu_HU/fusiondirectory.po b/ldapmanager/locale/hu_HU/fusiondirectory.po
index d9cd8f9559196ed5dfaf8693e06210401164265c..e548ee7b173fa558c3786d4e3783f04eea5160dd 100644
--- a/ldapmanager/locale/hu_HU/fusiondirectory.po
+++ b/ldapmanager/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +124,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 1cf37d82b94c49ca2c315be2d524e7baa73a57ae..cd38e3d6abd656bacb3acbc03959a38398f0fbd0 100644
--- a/ldapmanager/locale/id/fusiondirectory.po
+++ b/ldapmanager/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +124,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 7977e5fdb61b477b90d7d20ad064253ee921ab74..bcc962ce8c7b0eaf55e3caebfd0fa2e8d349ed88 100644
--- a/ldapmanager/locale/it_IT/fusiondirectory.po
+++ b/ldapmanager/locale/it_IT/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:24+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,11 +81,13 @@ msgstr "Valori fissi"
 #: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
 "Some fixed values that you might wanna use in the filling of the template."
-msgstr "Alcuni valori fissi che potreste voler utilizzare nel riempimento del modello"
+msgstr ""
+"Alcuni valori fissi che potreste voler utilizzare nel riempimento del "
+"modello"
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -99,7 +101,7 @@ msgstr "Riempimento dei modelli"
 msgid "Select fields associations"
 msgstr "Selezionare associazione di campi"
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr "Importazione non riuscita per la linea %d"
@@ -125,86 +127,91 @@ msgstr "Esporta/Importa l'annuario LDAP dal/nel formato LDIF"
 msgid "LDAP Manager"
 msgstr "Manager LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Esporta"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr "DN di una singola voce da esportare come ldif"
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Esporta una sola entry"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr "Filtro da utilizzare per selezionare gli oggetti da esportare"
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
-msgstr "Scaricare uno snapshot completo del directory LDAP per questa base come ldif"
+msgstr ""
+"Scaricare uno snapshot completo del directory LDAP per questa base come ldif"
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Esporta un file completo LDIF per"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "Importa file LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "Sovrascrivere voci esistenti"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
-msgstr "Rimuovere i campi che non sono in LDIF dalle voci LDAP se fossero esistenti ."
+msgstr ""
+"Rimuovere i campi che non sono in LDIF dalle voci LDAP se fossero esistenti "
+"."
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr "Importa un file LDIF nell'annuario LDAP. Ricorda che FusionDirectory non controllerÃ  i vostri LDIF per la conformitÃ  FusionDirectory."
+msgstr ""
+"Importa un file LDIF nell'annuario LDAP. Ricorda che FusionDirectory non "
+"controllerÃ  i vostri LDIF per la conformitÃ  FusionDirectory."
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr "Importa file LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "Nessun oggetto %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Errore d'autorizzazione"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Non hai il permesso di esportare %s !"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Errore"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr "Impossibile generare l'esportazione LDAP, errore '%s' !"
@@ -215,7 +222,12 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "L'estensione per l'importazione CSV ti permette di generare degli account utente a partire da un file contenente dei valori separati con dei punti e virgola. L'amministratore puÃ³ scegliere quali colonne saranno trasferite verso quale attributo. Nota che nel file CSV dovranno essere forniti almeno il GIVENNAME e il SURNAME."
+msgstr ""
+"L'estensione per l'importazione CSV ti permette di generare degli account "
+"utente a partire da un file contenente dei valori separati con dei punti e "
+"virgola. L'amministratore puÃ³ scegliere quali colonne saranno trasferite "
+"verso quale attributo. Nota che nel file CSV dovranno essere forniti almeno "
+"il GIVENNAME e il SURNAME."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/lv/fusiondirectory.po b/ldapmanager/locale/lv/fusiondirectory.po
index 274457342dd75c9fafd0391c6ea77d487d65f921..a0edc94cf2635837e84f22d8fe18eca9e3e404b4 100644
--- a/ldapmanager/locale/lv/fusiondirectory.po
+++ b/ldapmanager/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtrs"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP kÄ¼Å«da"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 ed70096377a3814bbc5944f62a42a35577b78db9..22bbd0f7a8a91f000757369cc750e138c83342ed 100644
--- a/ldapmanager/locale/nb/fusiondirectory.po
+++ b/ldapmanager/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Feil"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 0d43098565d7819a0560ec43e0baa1ba6e78f471..6007e8ce914dfffa79ce33921c8b950a46086f41 100644
--- a/ldapmanager/locale/nl/fusiondirectory.po
+++ b/ldapmanager/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: addons/ldapmanager/tabs_ldif.inc:31
 msgid "LDAP import/export"
-msgstr ""
+msgstr "LDAP importeren/exporteren"
 
 #: addons/ldapmanager/tabs_ldif.inc:32
 msgid "Allows the import or export of the ldap tree"
@@ -39,11 +40,11 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:43
 msgid "Import CSV"
-msgstr ""
+msgstr "CSV importeren"
 
 #: addons/ldapmanager/class_csvimport.inc:46
 msgid "Object type"
-msgstr ""
+msgstr "Object type"
 
 #: addons/ldapmanager/class_csvimport.inc:46
 msgid "Type of objects you wish to import"
@@ -59,11 +60,11 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:58
 msgid "CSV file"
-msgstr ""
+msgstr "CSV bestand"
 
 #: addons/ldapmanager/class_csvimport.inc:58
 msgid "Import a CSV file into your LDAP"
-msgstr ""
+msgstr "Importeer een CSV bestand in de LDAP"
 
 #: addons/ldapmanager/class_csvimport.inc:62
 msgid "Separator"
@@ -75,7 +76,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:69
 msgid "Fixed values"
-msgstr ""
+msgstr "Vaste waarden"
 
 #: addons/ldapmanager/class_csvimport.inc:69
 msgid ""
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -114,7 +115,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_ldapmanager.inc:45
 msgid "LDIF"
-msgstr ""
+msgstr "LDIF"
 
 #: addons/ldapmanager/class_ldapmanager.inc:46
 msgid "Export/Import the ldap tree to/from LDIF format"
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr "LDAP beheerder"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Exporteer"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exporteer een enkel record"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Exporteer een complete LDIF voor"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
-msgstr ""
+msgstr "Importeer LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
-msgstr ""
+msgstr "Importeer LDIF bestand"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "Zo geen object %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr "Je hebt geen rechten om te exporten %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Fout"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -214,7 +215,11 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "De CSV import plugin geeft methodes aan om gebruikers accounts te genereren van een bestand dat Semi-Colon Seperated waarden bevat. De administrator kan beslissen welke kolommen naar welk attribuut worden getransfereerd. Let op je moet minstens een VOORNAAM en een NAAM hebben."
+msgstr ""
+"De CSV import plugin geeft methodes aan om gebruikers accounts te genereren "
+"van een bestand dat Semi-Colon Seperated waarden bevat. De administrator kan"
+" beslissen welke kolommen naar welk attribuut worden getransfereerd. Let op "
+"je moet minstens een VOORNAAM en een NAAM hebben."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/pl/fusiondirectory.po b/ldapmanager/locale/pl/fusiondirectory.po
index a653dcce0c7a48c50faf311318bcc84b9790e5d4..25cd8ab0abcc592900067f8903e1fe8b449419c9 100644
--- a/ldapmanager/locale/pl/fusiondirectory.po
+++ b/ldapmanager/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Export"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Eksportuj pojedynczy wpis"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtr"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Eksportuj kompletny LDIF dla"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 bff94b004b9d08103e3e532789478d08d9f6a37a..cdc31db9bca5d1b75cf7c3416ca746d0defafa43 100644
--- a/ldapmanager/locale/pt/fusiondirectory.po
+++ b/ldapmanager/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 ccfcefc2b0519498b492784c417724149d41a1ac..47ac9b7b0e4d2ac2079264e2c8fae23d092bd618 100644
--- a/ldapmanager/locale/pt_BR/fusiondirectory.po
+++ b/ldapmanager/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr "Gerenciador LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "Exportar"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "Exportar entrada Ãºnica"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filtro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "Exportar LDIF completo para"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr "NÃ£o hÃ¡ esse objeto %s!"
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Erro de permissÃ£o"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, 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:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Erro"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
@@ -214,7 +215,11 @@ msgid ""
 " containing Semi-Colon Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
 "least the GIVENNAME and SURNAME set."
-msgstr "O plugin CSV import provÃª mÃ©todos para gerar contas de usuÃ¡rios a partir de de um arquivo com valores separados por ponto e vÃrgula. O administrador pode decidir quais colunas devem ser transferidas para um determinado atributo. Note que vocÃª deve ter ao menos o NOME e SOBRENOME."
+msgstr ""
+"O plugin CSV import provÃª mÃ©todos para gerar contas de usuÃ¡rios a partir de "
+"de um arquivo com valores separados por ponto e vÃrgula. O administrador "
+"pode decidir quais colunas devem ser transferidas para um determinado "
+"atributo. Note que vocÃª deve ter ao menos o NOME e SOBRENOME."
 
 #: addons/ldapmanager/contentcsv.tpl.c:5
 msgid "Select CSV file to import"
diff --git a/ldapmanager/locale/ru/fusiondirectory.po b/ldapmanager/locale/ru/fusiondirectory.po
index afc65047535cff6c24f1fe6f01c486679308c3da..10ddcd64d9a875573aa2c46b363aeba5ca47be8e 100644
--- a/ldapmanager/locale/ru/fusiondirectory.po
+++ b/ldapmanager/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -100,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -126,86 +125,88 @@ msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚/Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ Ð´ÐµÑ€ÐµÐ²Ð° ldap Ð²/Ð¸Ð· LDIF Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚"
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚ Ð¾Ð±ÑŠÐµÐºÑ‚Ð°"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ LDIF Ð´Ð»Ñ"
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ LDIF"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr "ÐŸÐµÑ€ÐµÐ¿Ð¸ÑÐ°Ñ‚ÑŒ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸"
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
-msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ Ñ„Ð°Ð¹Ð»Ð° LDIF Ð² Ð²Ð°Ñˆ LDAP. ÐŸÐ¾Ð¼Ð½Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾ FusionDirectory Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ LDIF Ð½Ð° ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð¾ÑÑ‚ÑŒ Ñ FusionDirectory. "
+msgstr ""
+"Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ Ñ„Ð°Ð¹Ð»Ð° LDIF Ð² Ð²Ð°Ñˆ LDAP. ÐŸÐ¾Ð¼Ð½Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾ FusionDirectory Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ "
+"Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ LDIF Ð½Ð° ÑÐ¾Ð²Ð¼ÐµÑÑ‚Ð¸Ð¼Ð¾ÑÑ‚ÑŒ Ñ FusionDirectory. "
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚, LDIF Ñ„Ð°Ð¹Ð»"
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 0a01e9b5ab7d27896998cc7d81f2910f5a881eb2..4ed8728bc622d92c447fb31db379e918cff17884 100644
--- a/ldapmanager/locale/ru@petr1708/fusiondirectory.po
+++ b/ldapmanager/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +124,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 e3868f0257e2959e099c9cebef98c6621db3cf7c..17574f73d2da852a74641a3507f5938e457953f9 100644
--- a/ldapmanager/locale/sv/fusiondirectory.po
+++ b/ldapmanager/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "Filter"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "RÃ¤ttighetsfel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Fel"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 df474a88e356e405eab453385b72adc51ea38bc5..894f6a3078acccf0e67662ab2778f17c3a3d64a3 100644
--- a/ldapmanager/locale/ug/fusiondirectory.po
+++ b/ldapmanager/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +84,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +124,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 617c50459fe0c1156af8d2903cb7081eba3e5b48..4207e8b08ed3f13e08d9d9ffa6bef398379e9748 100644
--- a/ldapmanager/locale/vi_VN/fusiondirectory.po
+++ b/ldapmanager/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr "Lá»—i vá» cáº¥p phÃ©p"
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "Lá»—i"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, 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 80ed0509808f3a83c90261ff490aa5b264f4e943..1797bfca2e0676d1bacba2ae4c4908a1f736f880 100644
--- a/ldapmanager/locale/zh/fusiondirectory.po
+++ b/ldapmanager/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,7 +85,7 @@ msgstr ""
 
 #: addons/ldapmanager/class_csvimport.inc:78
 #: addons/ldapmanager/class_csvimport.inc:104
-#: addons/ldapmanager/class_ldapmanager.inc:122
+#: addons/ldapmanager/class_ldapmanager.inc:121
 #: addons/ldapmanager/contentcsv.tpl.c:26
 #: addons/ldapmanager/contentcsv.tpl.c:29
 msgid "Import"
@@ -98,7 +99,7 @@ msgstr ""
 msgid "Select fields associations"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:250
+#: addons/ldapmanager/class_csvimport.inc:251
 #, php-format
 msgid "Import failed for line %d"
 msgstr ""
@@ -124,86 +125,86 @@ msgstr ""
 msgid "LDAP Manager"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:62
-#: addons/ldapmanager/class_ldapmanager.inc:75
-#: addons/ldapmanager/class_ldapmanager.inc:95
+#: addons/ldapmanager/class_ldapmanager.inc:61
+#: addons/ldapmanager/class_ldapmanager.inc:74
+#: addons/ldapmanager/class_ldapmanager.inc:94
 msgid "Export"
 msgstr "å¯¼å‡º"
 
-#: addons/ldapmanager/class_ldapmanager.inc:65
+#: addons/ldapmanager/class_ldapmanager.inc:64
 msgid "DN of a single entry to export as ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:79
+#: addons/ldapmanager/class_ldapmanager.inc:78
 msgid "Export single entry"
 msgstr "å¯¼å‡ºå•æ¡è®°å½•"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter"
 msgstr "è¿‡æ»¤å™¨"
 
-#: addons/ldapmanager/class_ldapmanager.inc:82
+#: addons/ldapmanager/class_ldapmanager.inc:81
 msgid "Filter to use for selecting objects to export"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:88
+#: addons/ldapmanager/class_ldapmanager.inc:87
 msgid ""
 "Download a complete snapshot of the running LDAP directory for this base as "
 "ldif"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:99
+#: addons/ldapmanager/class_ldapmanager.inc:98
 msgid "Export complete LDIF for"
 msgstr "å¯¼å‡ºæ•´ä¸ª LDIF "
 
-#: addons/ldapmanager/class_ldapmanager.inc:104
+#: addons/ldapmanager/class_ldapmanager.inc:103
 msgid "Import LDIF"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid "Overwrite existing entries"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:107
+#: addons/ldapmanager/class_ldapmanager.inc:106
 msgid ""
 "Remove fields that are not in the LDIF from the LDAP entries if they were "
 "existing."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:112
+#: addons/ldapmanager/class_ldapmanager.inc:111
 msgid ""
 "Import an LDIF file into your LDAP. Remember that FusionDirectory will not "
 "check your LDIFs for FusionDirectory conformance."
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:126
+#: addons/ldapmanager/class_ldapmanager.inc:125
 msgid "Import LDIF file"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:154
-#: addons/ldapmanager/class_ldapmanager.inc:199
+#: addons/ldapmanager/class_ldapmanager.inc:153
+#: addons/ldapmanager/class_ldapmanager.inc:198
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
-#: addons/ldapmanager/class_ldapmanager.inc:155
+#: addons/ldapmanager/class_ldapmanager.inc:154
 #, php-format
 msgid "No such object %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:175
+#: addons/ldapmanager/class_ldapmanager.inc:174
 msgid "Permission error"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:176
+#: addons/ldapmanager/class_ldapmanager.inc:175
 #, php-format
 msgid "You have no permission to export %s!"
 msgstr ""
 
-#: addons/ldapmanager/class_ldapmanager.inc:182
+#: addons/ldapmanager/class_ldapmanager.inc:181
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: addons/ldapmanager/class_ldapmanager.inc:183
+#: addons/ldapmanager/class_ldapmanager.inc:182
 #, php-format
 msgid "Failed to generate ldap export, error was \"%s\"!"
 msgstr ""
diff --git a/mail/admin/systems/services/imap/class_serviceIMAP.inc b/mail/admin/systems/services/imap/class_serviceIMAP.inc
index 37c56065714d32bd00545b8c55e8764bd1c17f77..fdc22bb8d1dd7f0e1f339cdcdd504b6e3898943b 100644
--- a/mail/admin/systems/services/imap/class_serviceIMAP.inc
+++ b/mail/admin/systems/services/imap/class_serviceIMAP.inc
@@ -50,11 +50,6 @@ 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();
diff --git a/mail/contrib/openldap/mail-fd-conf.schema b/mail/contrib/openldap/mail-fd-conf.schema
index c38a4931156c32a03b381451c78d835774d80e36..b4c374051c79d6f57309f918379fb6b448958b0d 100644
--- a/mail/contrib/openldap/mail-fd-conf.schema
+++ b/mail/contrib/openldap/mail-fd-conf.schema
@@ -12,14 +12,6 @@
 
 # Used in mailMethod
 
-attributetype ( 1.3.6.1.4.1.38414.10.10.1 NAME 'fdMailMethod'
-  DESC 'FusionDirectory - Mail method'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE )
-
 attributetype ( 1.3.6.1.4.1.38414.10.10.2 NAME 'fdMailAttribute'
   DESC 'FusionDirectory - Mail attribute'
   EQUALITY caseExactIA5Match
@@ -78,6 +70,6 @@ objectclass ( 1.3.6.1.4.1.38414.10.2.1 NAME 'fdMailPluginConf'
   DESC 'FusionDirectory mail plugin configuration'
   SUP top AUXILIARY
   MUST ( )
-  MAY ( fdMailMethod $ fdMailAttribute $ fdMailUserCreation $ fdMailFolderCreation $
+  MAY ( fdMailAttribute $ fdMailUserCreation $ fdMailFolderCreation $
         fdCyrusUseSlashes $ fdCyrusDeleteMailbox $ fdCyrusAutocreateFolders $ fdImapTimeout $
         fdMailSharedPrefix ) )
diff --git a/mail/locale/ar/fusiondirectory.po b/mail/locale/ar/fusiondirectory.po
index abed493831de101a4c8d6d8496873cadd26121b6..4979cac9fc93752ec7d454c8e10ed2a20bb4ffba 100644
--- a/mail/locale/ar/fusiondirectory.po
+++ b/mail/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,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"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ca/fusiondirectory.po b/mail/locale/ca/fusiondirectory.po
index 33ceb3b6b0d9aa3b074b3daaa5902869c82dd7d3..cba507eb1d00bae86bbde5c230b272f6ee0de855 100644
--- a/mail/locale/ca/fusiondirectory.po
+++ b/mail/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error de la configuraciÃ³"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/cs_CZ/fusiondirectory.po b/mail/locale/cs_CZ/fusiondirectory.po
index fac56185f36499b3784956df1c46310088adc9c8..ab10be10ba55d9b1d9e8741ab98bc7ed5e35dffb 100644
--- a/mail/locale/cs_CZ/fusiondirectory.po
+++ b/mail/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,20 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
-msgstr "Chyba e-mailu"
+msgstr "chyba e-mailu"
 
 #: personal/mail/class_mailAccount.inc:45
 #, php-format
 msgid "Cannot read quota settings: %s"
-msgstr "Nelze naÄÃst nastavenÃ kvÃ³ty: %s"
+msgstr "nelze naÄÃst nastavenÃ kvÃ³ty: %s"
 
 #: personal/mail/class_mailAccount.inc:55
 msgid "Quota usage"
@@ -41,168 +41,170 @@ msgstr "KvÃ³ta vyuÅ¾itÃ"
 msgid "Part of the quota which is used"
 msgstr "ÄŒÃ¡st kvÃ³ty, kterÃ¡ je vyuÅ¾ita"
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
-msgstr "E-mail"
+msgstr "e-mail"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
-msgstr "NastavenÃ e-mailu"
+msgstr "nastavenÃ e-mailu"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "E-mailovÃ½ ÃºÄet"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
-msgstr "HlavnÃ adresa"
+msgstr "hlavnÃ adresa"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "HlavnÃ e-mailovÃ¡ adresa"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
-msgstr "Server"
+msgstr "server"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Zadejte poÅ¡tovnÃ server, na kterÃ©m bude uÅ¾ivatel mÃt svÅ¯j ÃºÄet."
+msgstr "Zvolte poÅ¡tovnÃ server, na kterÃ©m bude uÅ¾ivatel mÃt svÅ¯j ÃºÄet."
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
-msgstr "Velikost kvÃ³ty"
+msgstr "kvÃ³ta objemu dat"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "OstatnÃ adresy a pÅ™esmÄ›rovÃ¡nÃ"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
-msgstr "AlternativnÃ adresy"
+msgstr "alternativnÃ adresy"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
-msgstr "Seznam alternativnÃch e-mailovÃ½ch adres"
+msgstr "seznam alternativnÃch e-mailovÃ½ch adres"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
-msgstr "PÅ™esmÄ›rovat zprÃ¡vy na"
+msgstr "pÅ™esmÄ›rovat zprÃ¡vy na"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "Adresy, na kterÃ© by mÄ›ly bÃ½t pÅ™eposÃlÃ¡ny zprÃ¡vy"
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
-msgstr "ZprÃ¡va â€žjsem na dovolenÃ©â€œ"
+msgstr "zprÃ¡va â€žjsem na dovolenÃ©â€œ"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
-msgstr "Zapnout samoÄinnou odpovÄ›Ä â€žjsem na dovolenÃ©â€œ"
+msgstr "aktivovat zprÃ¡vu â€žjsem na dovolenÃ©â€œ"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "ZaÅ¡krtnÄ›te pro automatickÃ© odpovÃdÃ¡nÃ nÃÅ¾e uvedenou zprÃ¡vou â€žjsem na dovolenÃ©â€œ"
+msgstr ""
+"zaÅ¡krtnÄ›te pro automatickÃ© odpovÃdÃ¡nÃ nÃÅ¾e uvedenou zprÃ¡vou â€žjsem na "
+"dovolenÃ©â€œ"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "od"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "dokud"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
-msgstr "PokroÄilÃ© pÅ™edvolby e-mailu"
+msgstr "pokroÄilÃ© volby e-mailu"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
-msgstr "UÅ¾ivateli je dovoleno pÅ™ijÃmat a odesÃlat pouze mÃstnÃ poÅ¡tu"
+msgstr "uÅ¾ivateli je dovoleno pÅ™ijÃmat a odesÃlat pouze mÃstnÃ poÅ¡tu"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Vyberte, pokud uÅ¾ivatel mÃ¡ pÅ™ijÃmat a odesÃlat pouze v rÃ¡mci vlastnÃ domÃ©ny"
+msgstr ""
+"zvolte, zda uÅ¾ivatel bude moci pÅ™ijÃmat a odesÃlat pouze v rÃ¡mci vlastnÃ "
+"domÃ©ny"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
-msgstr "NedoruÄovat do vlastnÃ schrÃ¡nky"
+msgstr "nedoruÄovat do vlastnÃ schrÃ¡nky"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Vyberte, pokud chcete pÅ™eposÃlat zprÃ¡vy bez toho, abyste dostÃ¡vali vlastnÃ kopie"
+msgstr ""
+"Zvolte, zda chcete pÅ™eposÃlat zprÃ¡vy bez toho, abyste si ponechÃ¡vali jejich "
+"kopie."
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "E-mailovÃ¡ metodou se nelze pÅ™ipojit: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
-msgstr "Nelze aktualizovat schrÃ¡nku: %s"
+msgstr "NezdaÅ™ilo se aktualizovat schrÃ¡nku: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
-msgstr "Nelze zapsat nastavenÃ kvÃ³ty: %s"
+msgstr "NezdaÅ™ilo se zapsat nastavenÃ kvÃ³ty: %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "NastavenÃ uklÃ¡dÃ¡nÃ zÃ¡znamÅ¯ o chybÃ¡ch zprÃ¡v v Sieve"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr "E-mailovou schrÃ¡nku se nedaÅ™Ã odebrat, nedaÅ™Ã se pÅ™ipojit metodou: %s"
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Nelze odebrat schÃ¡rnku: %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
-msgstr "Chyba v nastavenÃ"
+msgstr "chyba v nastavenÃ"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "NastavenÃ½ atribut zprÃ¡vy '%s' nenÃ podporovÃ¡n!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "NeznÃ¡mÃ½ systÃ©m sprÃ¡vy e-mailÅ¯ '%s'!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Å¾Ã¡dnÃ©"
+msgid "Mail method \"%s\" is unknown!"
+msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "neznÃ¡mÃ©"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
-msgstr "NeomezenÃ©"
+msgstr "neomezenÃ©"
 
 #: config/mail/class_mailPluginConfig.inc:29
 msgid "Mail plugin configuration"
@@ -210,7 +212,7 @@ msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu E-mail"
 
 #: config/mail/class_mailPluginConfig.inc:44
 msgid "Account identification attribute"
-msgstr "Atribut, dle kterÃ©ho budou rozliÅ¡ovÃ¡ny ÃºÄty"
+msgstr "atribut, dle kterÃ©ho budou rozliÅ¡ovÃ¡ny ÃºÄty"
 
 #: config/mail/class_mailPluginConfig.inc:45
 msgid "Which attribute will be used to create accounts."
@@ -239,7 +241,9 @@ msgstr "PouÅ¾Ãt cyrus v unixovÃ©m stylu"
 #: config/mail/class_mailPluginConfig.inc:61
 msgid ""
 "Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
-msgstr "UrÄuje, zda majÃ mÃt jmennÃ© prostory v IMAP podobu nÄ›co/neco nebo nÄ›co.nÄ›co ."
+msgstr ""
+"UrÄuje, zda majÃ mÃt jmennÃ© prostory v IMAP podobu nÄ›co/neco nebo nÄ›co.nÄ›co "
+"."
 
 #: config/mail/class_mailPluginConfig.inc:65
 msgid "Delete mailbox on account deletion"
@@ -249,7 +253,9 @@ msgstr "PÅ™i smazÃ¡nÃ ÃºÄtu smazat i e-mailovou schrÃ¡nku"
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "UrÄuje, zda mÃ¡ bÃ½t po smazÃ¡nÃ ÃºÄtu v LDAP tÃ©Å¾ odebrÃ¡na e-mailovÃ¡ schrÃ¡nka na IMAP serveru."
+msgstr ""
+"UrÄuje, zda mÃ¡ bÃ½t po smazÃ¡nÃ ÃºÄtu v LDAP tÃ©Å¾ odebrÃ¡na e-mailovÃ¡ schrÃ¡nka na"
+" IMAP serveru."
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Cyrus autocreate folders"
@@ -259,7 +265,9 @@ msgstr "SamoÄinnÃ© vytvÃ¡Å™enÃ sloÅ¾ek na Cyrus"
 msgid ""
 "List of personal IMAP folders that should be created along initial account "
 "creation."
-msgstr "Seznam osobnÃ IMAP sloÅ¾ek, kterÃ© by mÄ›ly bÃ½t vytvoÅ™en spoleÄnÄ› s ÃºvodnÃm vytvÃ¡Å™enÃm ÃºÄtu."
+msgstr ""
+"Seznam osobnÃ IMAP sloÅ¾ek, kterÃ© by mÄ›ly bÃ½t vytvoÅ™en spoleÄnÄ› s ÃºvodnÃm "
+"vytvÃ¡Å™enÃm ÃºÄtu."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "IMAP timeout"
@@ -299,7 +307,7 @@ msgstr "AlternativnÃ e-mailovÃ© adresy tÃ©to skupiny"
 
 #: admin/groups/mail/class_groupMail.inc:77
 msgid "Forward messages to non group members"
-msgstr "PÅ™eposlat zprÃ¡vy tÄ›m, kdo nejsou Äleny skupiny"
+msgstr "pÅ™eposlat zprÃ¡vy tÄ›m, kdo nejsou Äleny skupiny"
 
 #: admin/groups/mail/class_groupMail.inc:81
 msgid "Only allowed to receive local mail"
@@ -309,7 +317,9 @@ msgstr "MÅ¯Å¾e pÅ™ijÃmat pouze mÃstnÃ e-maily"
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
-msgstr "Zda je tÃ©to e-mailovÃ© skupinÄ› omezeno pÅ™ijÃmÃ¡nÃ zprÃ¡v pouze na ty od mÃstnÃch odesilatelÅ¯"
+msgstr ""
+"Zda je tÃ©to e-mailovÃ© skupinÄ› omezeno pÅ™ijÃmÃ¡nÃ zprÃ¡v pouze na ty od "
+"mÃstnÃch odesilatelÅ¯"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
@@ -321,4 +331,4 @@ msgstr "IMAP/POP3"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:33
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
diff --git a/mail/locale/de/fusiondirectory.po b/mail/locale/de/fusiondirectory.po
index c08ce76ab54dc395b99a7b6bbb5b12b30c433a9c..099dde0c86e795d865f619db453c4c70c8cd961e 100644
--- a/mail/locale/de/fusiondirectory.po
+++ b/mail/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Mail-Fehler"
 
@@ -41,166 +41,168 @@ msgstr "Kontingent-Nutzung"
 msgid "Part of the quota which is used"
 msgstr "Teil der verwendeten Quota"
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Mail"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "Mail-Konto"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "PrimÃ¤re Adresse"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "PrimÃ¤re Mailadresse"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Server"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "WÃ¤hlen Sie den Mail-Server, auf dem dieses Konto angelegt werden soll"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Kontingent-GrÃ¶ÃŸe"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "Weitere Adressen und Weiterleitungen"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "Adressen, an die Nachrichten weitergeleitet werden sollten"
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "WÃ¤hlen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen Text zu versenden."
+msgstr ""
+"WÃ¤hlen Sie dies, um automatisch eine Urlaubsmeldung mit dem unten angebenen "
+"Text zu versenden."
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "von"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "bis"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Erweiterte Mail-Einstellungen"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "WÃ¤hlen Sie dies, wenn der Benutzer Mails nur innerhalb seiner DomÃ¤ne senden und empfangen darf"
+msgstr ""
+"WÃ¤hlen Sie dies, wenn der Benutzer Mails nur innerhalb seiner DomÃ¤ne senden "
+"und empfangen darf"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "WÃ¤hlen Sie diese Einstellung, wenn Mails lediglich weitergeleitet werden sollen, ohne eine lokale Kopie zu speichern."
+msgstr ""
+"WÃ¤hlen Sie diese Einstellung, wenn Mails lediglich weitergeleitet werden "
+"sollen, ohne eine lokale Kopie zu speichern."
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail-Methode kann nicht verbinden: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kann das Postfach nicht aktualisieren: '%s'"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kann Kontingent-Einstellungen nicht sichern: %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Fehler beim Speichern der Sieve-Einstellungen"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kann das Postfach nicht entfernen: %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstÃ¼tzt!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Mail-Methode '%s' ist unbekannt!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Keine"
+msgid "Mail method \"%s\" is unknown!"
+msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Ohne BeschrÃ¤nkung"
 
@@ -249,7 +251,9 @@ msgstr "Mailbox bei KontolÃ¶schung ebenfalls lÃ¶schen"
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "Bestimmt ob die Mailbox vom IMAP-Server nach der LÃ¶schung in LDAP gelÃ¶scht werden soll."
+msgstr ""
+"Bestimmt ob die Mailbox vom IMAP-Server nach der LÃ¶schung in LDAP gelÃ¶scht "
+"werden soll."
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Cyrus autocreate folders"
@@ -259,7 +263,9 @@ msgstr "Cyrus autocreate folders"
 msgid ""
 "List of personal IMAP folders that should be created along initial account "
 "creation."
-msgstr "Liste von persÃ¶nlichen IMAP-Ordnern, die wÃ¤hrend der ersten Kontenerstellung erstellt werden sollten ."
+msgstr ""
+"Liste von persÃ¶nlichen IMAP-Ordnern, die wÃ¤hrend der ersten Kontenerstellung"
+" erstellt werden sollten ."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "IMAP timeout"
@@ -291,7 +297,7 @@ msgstr "Die primÃ¤re Mailadresse"
 
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server mail"
-msgstr "Servermail"
+msgstr "Server Mail"
 
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative mail addresses for the group"
diff --git a/mail/locale/el_GR/fusiondirectory.po b/mail/locale/el_GR/fusiondirectory.po
index 74cb36266b1f78ade545d0f5c3f0355fa27b1f2b..6e356fc953ed213c438e7fa570808f255b5a8252 100644
--- a/mail/locale/el_GR/fusiondirectory.po
+++ b/mail/locale/el_GR/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# test <pkostas@gmail.com>, 2015
-# Thanasis Angelogeorgos <thaggel@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
@@ -44,166 +41,169 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Î‘Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "ÎšÏÏÎ¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "ÎšÏÏÎ¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
-msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "Î†Î»Î»ÎµÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î±Î½Î±Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµÎ¹Ï‚"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Î•Î½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÎÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ ÎµÎ½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÏŽÎ½ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµvn ÎºÎ±Î¹ Î±Î½Î±Î´ÏÎ¿Î¼Î¿Î»Î¿Î³Î®ÏƒÎµvn"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚ ÏƒÏ„Î¿"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "Î”Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¹Ï‚ Î¿Ï€Î¿Î¯ÎµÏ‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÏÎ¿Ï‰Î¸ÎµÎ¯Ï„Î±Î¹ Î· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "ÎœÎ®Î½Ï…Î¼Î± Î±Ï€Î¿Ï…ÏƒÎ¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚ Î±Ï€Î¿Ï…ÏƒÎ¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î³Î¹Î± Ï„Î·Î½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· Î¼Îµ Ï„Î¿ Î¼Î®Î½Ï…Î¼Î± Î±Ï€Î¿Ï…Î¯Î±Ï‚ Ï€Î¿Ï… ÎºÎ±Î¸Î¿ÏÎ¯Î¶ÎµÏ„Î±Î¹ ÏƒÏ„Î· ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î±"
+msgstr ""
+"Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î³Î¹Î± Ï„Î·Î½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· Î¼Îµ Ï„Î¿ Î¼Î®Î½Ï…Î¼Î± Î±Ï€Î¿Ï…Î¯Î±Ï‚ Ï€Î¿Ï… ÎºÎ±Î¸Î¿ÏÎ¯Î¶ÎµÏ„Î±Î¹ ÏƒÏ„Î· "
+"ÏƒÏ…Î½ÎÏ‡ÎµÎ¹Î±"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "Î±Ï€ÏŒ"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "ÎµÏ‰Ï‚"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Î ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½ÎµÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
-msgstr "Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹ ÎºÎ±Î¹ Î½Î± Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î¼ÏŒÎ½Î¿ Ï„Î¿Ï€Î¹ÎºÎ® Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
+msgstr ""
+"Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹ ÎºÎ±Î¹ Î½Î± Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î¼ÏŒÎ½Î¿ Ï„Î¿Ï€Î¹ÎºÎ® Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ, ÏŒÏ„Î±Î½ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹ ÎºÎ±Î¹ Î½Î± Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î± Î¼ÏŒÎ½Î¿ Î¼ÎÏƒÎ± ÏƒÏ„Î¿Î½ Î¤Î¿Î¼ÎÎ± Ï„Î¿Ï…"
+msgstr ""
+"Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ, ÏŒÏ„Î±Î½ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹ ÎºÎ±Î¹ Î½Î± Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
+" Î¼ÏŒÎ½Î¿ Î¼ÎÏƒÎ± ÏƒÏ„Î¿Î½ Î¤Î¿Î¼ÎÎ± Ï„Î¿Ï…"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Î§Ï‰ÏÎ¯Ï‚ Ï€Î±ÏÎ¬Î´Î¿ÏƒÎ· ÏƒÏ„Î¿ Î´Î¹ÎºÏŒ Ï„Î¿Ï… Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²ÏŽÏ„Î¹Î¿"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î±Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Ï€ÏÎ¿Ï‰Î¸ÎµÎ¯Ï„Î±Î¹ Î· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î± Ï‡Ï‰ÏÎ¯Ï‚ Î½Î± Î»Î±Î¼Î²Î¬Î½Î¿Î½Ï„Î±Î¹ Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î± Î±Ï…Ï„ÏŽÎ½"
+msgstr ""
+"Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î±Î½ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Ï€ÏÎ¿Ï‰Î¸ÎµÎ¯Ï„Î±Î¹ Î· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î± Ï‡Ï‰ÏÎ¯Ï‚ Î½Î± Î»Î±Î¼Î²Î¬Î½Î¿Î½Ï„Î±Î¹ "
+"Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î± Î±Ï…Ï„ÏŽÎ½"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚ Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²Ï‰Ï„Î¯Î¿Ï…: %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
+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
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î¿"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Î‘Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿"
 
@@ -252,7 +252,9 @@ msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î® Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²Ï‰Ï„Î¯Î¿Ï… ÏŒÏ„Î±Î½ Î´Î¹Î±Î³ÏÎ¬
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Î½ Ï„Î¿ Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²ÏŽÏ„Î¹Î¿ Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†ÎµÎ¯ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® IMAP, Î¼ÎµÏ„Î¬ Ï„Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÏ„Î¿Î½ LDAP"
+msgstr ""
+"ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Î½ Ï„Î¿ Î³ÏÎ±Î¼Î¼Î±Ï„Î¿ÎºÎ¹Î²ÏŽÏ„Î¹Î¿ Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†ÎµÎ¯ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® IMAP, Î¼ÎµÏ„Î¬"
+" Ï„Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÏ„Î¿Î½ LDAP"
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Cyrus autocreate folders"
@@ -312,7 +314,8 @@ msgstr "Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± Î»Î±Î¼Î²Î¬Î½Î¿Ï…Î½ Î¼ÏŒÎ½Î¿ Ï„Î¿Ï€Î¹ÎºÎ® Î±
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
-msgstr "Î‘Î½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± Î´ÎÏ‡ÎµÏ„Î±Î¹ Î¼Î·Î½ÏÎ¼Î±Ï„Î± Î±Ï€ÏŒ Ï„Î¿Ï€Î¹ÎºÎ¿ÏÏ‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»ÎµÎ¯Ï‚"
+msgstr ""
+"Î‘Î½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± Î´ÎÏ‡ÎµÏ„Î±Î¹ Î¼Î·Î½ÏÎ¼Î±Ï„Î± Î±Ï€ÏŒ Ï„Î¿Ï€Î¹ÎºÎ¿ÏÏ‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»ÎµÎ¯Ï‚"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
diff --git a/mail/locale/en/fusiondirectory.po b/mail/locale/en/fusiondirectory.po
index dee4054b7744ce151b0c803a0f6ec7bf3dc8c54c..9966ad516f65b5427a13dc64f2892137ffc2eb75 100644
--- a/mail/locale/en/fusiondirectory.po
+++ b/mail/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -18,13 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/es/fusiondirectory.po b/mail/locale/es/fusiondirectory.po
index a43c418cf0d1b3620be5374dbf298888e65385f3..53364e32394c7a28c5ac483f05439fa5a93337ff 100644
--- a/mail/locale/es/fusiondirectory.po
+++ b/mail/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Error de correo"
 
@@ -41,166 +41,167 @@ msgstr "Uso de Cuota"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Correo ElectrÃ³nico"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ParÃ¡metros de correo"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estarÃ¡ hospedado."
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "TamaÃ±o de la cuota"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "Seleccione para responder automÃ¡ticamente con el mensaje de ausencia definido aquÃ"
+msgstr ""
+"Seleccione para responder automÃ¡ticamente con el mensaje de ausencia "
+"definido aquÃ"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "desde"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "hasta"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
-msgstr "El usuario solo esta permitido a enviar y recibir correo de forma local"
+msgstr ""
+"El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Seleccione si el usuario solo puede enviar y recibir dentro de su propio dominio"
+msgstr ""
+"Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
+"dominio"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "El mÃ©todo de correo no puede conectar: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo actualizar el buzÃ³n de correo: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "No puedo guardar el parÃ¡metro de cuota: %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Hay un error de correo al grabar la configuraciÃ³n sieve"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Â¡El atributo '%s' configurado en el correo no esta soportado!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Â¡El mÃ©todo de correo '%s' es desconocido!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
+msgid "Mail method \"%s\" is unknown!"
+msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Sin limite"
 
diff --git a/mail/locale/es_CO/fusiondirectory.po b/mail/locale/es_CO/fusiondirectory.po
index 67f53db326a60e5f46818ea3d44d0e6942a9db30..c3bd87f66de03419d343a99bd14bd28e363d142e 100644
--- a/mail/locale/es_CO/fusiondirectory.po
+++ b/mail/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Correo"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error de configuraciÃ³n"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
-
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/es_VE/fusiondirectory.po b/mail/locale/es_VE/fusiondirectory.po
index ef0574b710e1be159e71a0b8c259e2fe30cc4de7..911cbb93537b0ce0e3433d63e6e79f45c1f8646a 100644
--- a/mail/locale/es_VE/fusiondirectory.po
+++ b/mail/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Error de correo"
 
@@ -41,166 +41,167 @@ msgstr "Uso de Cuota"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Correo ElectrÃ³nico"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ParÃ¡metros de correo"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estarÃ¡ hospedado."
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "TamaÃ±o de cuota"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "Seleccione para responder automÃ¡ticamente con el mensaje de ausencia definido aquÃ"
+msgstr ""
+"Seleccione para responder automÃ¡ticamente con el mensaje de ausencia "
+"definido aquÃ"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "desde"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "hasta"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
-msgstr "El usuario solo esta permitido a enviar y recibir correo de forma local"
+msgstr ""
+"El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Seleccione si el usuario solo puede enviar y recibir dentro de su propio dominio"
+msgstr ""
+"Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
+"dominio"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "El mÃ©todo de correo no puede conectar: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo actualizar el buzÃ³n de correo: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "No puedo guardar el parÃ¡metro de cuota: %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Hay un error de correo al grabar la configuraciÃ³n sieve"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "No se puede eliminar el buzÃ³n: %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Â¡El atributo '%s' configurado en el correo no esta soportado!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Â¡El mÃ©todo de correo '%s' es desconocido!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ninguno"
+msgid "Mail method \"%s\" is unknown!"
+msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Sin limite"
 
diff --git a/mail/locale/fa_IR/fusiondirectory.po b/mail/locale/fa_IR/fusiondirectory.po
index ff4b47229e341bdaf5ea3cf1f4f2e1cda3b0ab40..6ff79d894925c37575d7f70613334085caabfd39 100644
--- a/mail/locale/fa_IR/fusiondirectory.po
+++ b/mail/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/fi_FI/fusiondirectory.po b/mail/locale/fi_FI/fusiondirectory.po
index bffad98884c30311b2623c275cba65f3a5600d5f..3eca0ba76521224d91833b3ddfbc8e4063d32735 100644
--- a/mail/locale/fi_FI/fusiondirectory.po
+++ b/mail/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/fr/fusiondirectory.po b/mail/locale/fr/fusiondirectory.po
index 6907651c3785f60e79c00ee5ce16f9a8863093eb..e8fe58f01f7a59cd834e9f21d85a7edf13964492 100644
--- a/mail/locale/fr/fusiondirectory.po
+++ b/mail/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Erreur du serveur de courriel"
 
@@ -43,166 +41,171 @@ msgstr "Utilisation des quotas"
 msgid "Part of the quota which is used"
 msgstr "Part du quota qui est utilisÃ©e"
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
-msgstr "Courriel"
+msgstr "Messagerie"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ParamÃ¨tres de courriel"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "Compte courriel"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Adresse principale"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "Adresse de courriel principale"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Serveur"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Indiquez le serveur de courriel de l'utilisateur"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Taille du quota"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "Autres adresses et redirections"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de courriel alternatives"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "TransfÃ©rer les messages vers"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "Adresses Ã  laquelle les messages doivent Ãªtre redirigÃ©s"
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Message d'absence"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Activer le message d'absence"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "RÃ©ponse automatique par le message d'absence ci-dessous"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "du"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "jusqu'au"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Options de courriel avancÃ©es"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
-msgstr "Les utilisateurs ne sont autorisÃ©s qu'Ã  envoyer et recevoir des messages locaux"
+msgstr ""
+"Les utilisateurs ne sont autorisÃ©s qu'Ã  envoyer et recevoir des messages "
+"locaux"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "SÃ©lectionnez si vous voulez que les utilisateurs puissent envoyer et recevoir des courriels uniquement dans leur propre domaine"
+msgstr ""
+"SÃ©lectionnez si vous voulez que les utilisateurs puissent envoyer et "
+"recevoir des courriels uniquement dans leur propre domaine"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des courriels dans sa propre boite"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "SÃ©lectionnez ceci si vous souhaitez relayer les messages sans garder de copie de ceux-ci"
+msgstr ""
+"SÃ©lectionnez ceci si vous souhaitez relayer les messages sans garder de "
+"copie de ceux-ci"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Le mÃ©thode de courriel ne peut pas se connecterâ€¯: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "Le compte de courriel '%s' n'existe pas sur le serveurâ€¯: %s"
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossible de mettre Ã  jour le compteâ€¯: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Impossible d'Ã©crire les paramÃ¨tres de quotaâ€¯: %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Erreur lors de la sauvegarde du script sieve"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
+"Erreur de messagerie lors de l'enregistrement des paramÃ¨tres sieve: %s"
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
-msgstr "Impossible de supprimer le compte de messagerie, impossible de se connecter Ã  : %s"
+msgstr ""
+"Impossible de supprimer le compte de messagerie, impossible de se connecter "
+"Ã  : %s"
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossible de supprimer le compte de messagerie : %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "L'attribut de messagerie '%s' n'est pas supportÃ©â€¯!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Le mÃ©thode de messagerie '%s' est inconnueâ€¯!"
+msgid "Mail method \"%s\" is unknown!"
+msgstr "Le mÃ©thode de messagerie \"%s\" est inconnueâ€¯!"
 
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Aucun"
-
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "IllimitÃ©"
 
@@ -241,7 +244,9 @@ msgstr "Utiliser le style Cyrus UNIX"
 #: config/mail/class_mailPluginConfig.inc:61
 msgid ""
 "Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
-msgstr "DÃ©termine si \"foo/bar\" ou \"foo.bar\" doit Ãªtre utilisÃ© comme espace de nom IMAP."
+msgstr ""
+"DÃ©termine si \"foo/bar\" ou \"foo.bar\" doit Ãªtre utilisÃ© comme espace de "
+"nom IMAP."
 
 #: config/mail/class_mailPluginConfig.inc:65
 msgid "Delete mailbox on account deletion"
@@ -251,7 +256,9 @@ msgstr "Supprimer le compte de courriel lors de la suppression du compte"
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "DÃ©termine si la boÃ®te aux lettres doit Ãªtre retirÃ©e de votre serveur IMAP aprÃ¨s la suppression du compte LDAP."
+msgstr ""
+"DÃ©termine si la boÃ®te aux lettres doit Ãªtre retirÃ©e de votre serveur IMAP "
+"aprÃ¨s la suppression du compte LDAP."
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Cyrus autocreate folders"
@@ -261,7 +268,9 @@ msgstr "CrÃ©ation automatique des dossiers Cyrus"
 msgid ""
 "List of personal IMAP folders that should be created along initial account "
 "creation."
-msgstr "Liste des dossiers IMAP personnels qui doivent Ãªtre crÃ©Ã©s lors de la crÃ©ation du compte initial."
+msgstr ""
+"Liste des dossiers IMAP personnels qui doivent Ãªtre crÃ©Ã©s lors de la "
+"crÃ©ation du compte initial."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "IMAP timeout"
@@ -311,7 +320,9 @@ msgstr "Les utilisateurs ne sont autorisÃ©s qu'Ã  recevoir des messages locaux"
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
-msgstr "Ce groupe mail est uniquement autorisÃ© Ã  recevoir des messages provenant d'expÃ©diteurs locaux"
+msgstr ""
+"Ce groupe mail est uniquement autorisÃ© Ã  recevoir des messages provenant "
+"d'expÃ©diteurs locaux"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
@@ -323,4 +334,4 @@ msgstr "IMAP/POP3"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:33
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
diff --git a/mail/locale/hu_HU/fusiondirectory.po b/mail/locale/hu_HU/fusiondirectory.po
index 6a2ddd9a445096c932adf5d963c23ae58dd02685..0b99d028e230c2845a2e7349ecf6b8a719c9090c 100644
--- a/mail/locale/hu_HU/fusiondirectory.po
+++ b/mail/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/id/fusiondirectory.po b/mail/locale/id/fusiondirectory.po
index c3d9148ee1c6ad866f57485b61bf985cf862627d..16de7eb5a04464622685c1772feb6fe0c8eb1142 100644
--- a/mail/locale/id/fusiondirectory.po
+++ b/mail/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/it_IT/fusiondirectory.po b/mail/locale/it_IT/fusiondirectory.po
index 9f5dabc517b366cc6b1838af17d8cea1486446fa..59f7269c8fab974022ef243b08df4a3073fe2ca3 100644
--- a/mail/locale/it_IT/fusiondirectory.po
+++ b/mail/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Errore del server di posta elettronica"
 
@@ -44,166 +41,168 @@ msgstr "Utilizzo della quota"
 msgid "Part of the quota which is used"
 msgstr "Parte della quota utilizzata"
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Mail"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "Impostazioni della posta elettronica"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "Account email"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Indirizzo principale"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "Indirizzo mail principale"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Server"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
-msgstr "Specifica il server di posta elettronica che ospiterÃ  l'account dell'utente"
+msgstr ""
+"Specifica il server di posta elettronica che ospiterÃ  l'account dell'utente"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Dimensione della quota"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "Altri indirizzi e redirezioni"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Indirizzi alternativi"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Elenco degli indirizzi alternativi"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "Trasferisci i messaggi a"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "Indirizzi verso iquali i messaggi dovranno essere inoltrati"
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Messaggio d'assenza"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Attiva il messaggio d'assenza"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Seleziona per rispondere automaticamente con il messaggio seguente"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "da"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "fino a"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Opzioni avanzate di posta elettronica"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "L'utente Ã¨ abilitato a inviare e ricevere solo messaggi locali"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Seleziona se l'utente puÃ² inviare e ricevere messaggi solo all'interno del suo dominio"
+msgstr ""
+"Seleziona se l'utente puÃ² inviare e ricevere messaggi solo all'interno del "
+"suo dominio"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Non recapitare nella casella di posta elettronica dell'utente"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Seleziona se intendi inoltrare le mail senza mantenerne una copia locale"
+msgstr ""
+"Seleziona se intendi inoltrare le mail senza mantenerne una copia locale"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "L'algoritmo di posta elettronica non riesce a connettersi : %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "L'account di posta elettronica \"%s\" non esiste sul server mail: %s"
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossibile aggiornare l'account : %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Impossibile impostare le quote : %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Errore del server di posta elettronica quando si cercano di salvare le impostazioni dello script sieve "
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr "Impostazioni del set di risparmio di errori di posta: %s"
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
-msgstr "Impossibile rimuovere la mailbox, il metodo di posta non riesce a connettersi a: %s"
+msgstr ""
+"Impossibile rimuovere la mailbox, il metodo di posta non riesce a "
+"connettersi a: %s"
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossibile rimuovere mailbox : %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "L'attributo mail '%s' non Ã¨ supportato !"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "L'algoritmo per la posta elettronica '%s' Ã¨ sconosciuto !"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Nessuno"
+msgid "Mail method \"%s\" is unknown!"
+msgstr "Il metodo di posta \"%s\" non Ã¨ noto!"
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Illimitato"
 
@@ -233,7 +232,9 @@ msgstr "Modello per la cartella mail"
 
 #: config/mail/class_mailPluginConfig.inc:56
 msgid "Override the methods default account creation syntax."
-msgstr "Sovrascrivere i metodi predefiniti per la sintassi della creazione degli account."
+msgstr ""
+"Sovrascrivere i metodi predefiniti per la sintassi della creazione degli "
+"account."
 
 #: config/mail/class_mailPluginConfig.inc:60
 msgid "Use cyrus UNIX style"
@@ -242,7 +243,9 @@ msgstr "Usa lo stile cyrus UNIX"
 #: config/mail/class_mailPluginConfig.inc:61
 msgid ""
 "Determines if 'foo/bar' or 'foo.bar' should be uses as namespaces in IMAP."
-msgstr "Determina se ' foo / bar' o ' foo.bar ' dovrebbe essere usato come namespace in IMAP ."
+msgstr ""
+"Determina se ' foo / bar' o ' foo.bar ' dovrebbe essere usato come namespace"
+" in IMAP ."
 
 #: config/mail/class_mailPluginConfig.inc:65
 msgid "Delete mailbox on account deletion"
@@ -252,7 +255,9 @@ msgstr "Rimuovi la mailbox alla rimozione dell'utente"
 msgid ""
 "Determines if the mailbox should be removed from your IMAP server after the "
 "account is deleted in LDAP."
-msgstr "Determina se la milbox dovrÃ  essere rimossa dal vostro server IMAP in seguito alla rimozione dell'account utente nell'annuario LDAP."
+msgstr ""
+"Determina se la milbox dovrÃ  essere rimossa dal vostro server IMAP in "
+"seguito alla rimozione dell'account utente nell'annuario LDAP."
 
 #: config/mail/class_mailPluginConfig.inc:71
 msgid "Cyrus autocreate folders"
@@ -262,7 +267,9 @@ msgstr "Creazione automatica delle cartelle da parte di cyrus"
 msgid ""
 "List of personal IMAP folders that should be created along initial account "
 "creation."
-msgstr "Elenco delle cartelle IMAP personali che dovranno essere create durante la creazione iniziale dell'account."
+msgstr ""
+"Elenco delle cartelle IMAP personali che dovranno essere create durante la "
+"creazione iniziale dell'account."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "IMAP timeout"
@@ -312,7 +319,9 @@ msgstr "L'utente Ã¨ abilitato a ricevere solo messaggi locali"
 msgid ""
 "Whether this group mail is only allowed to receive messages from local "
 "senders"
-msgstr "Questo gruppo email e' autorizzato unicamente a ricevere messaggi da mittenti locali"
+msgstr ""
+"Questo gruppo email e' autorizzato unicamente a ricevere messaggi da "
+"mittenti locali"
 
 #: admin/systems/services/imap/class_serviceIMAP.inc:32
 msgid "IMAP/POP3 generic service"
diff --git a/mail/locale/lv/fusiondirectory.po b/mail/locale/lv/fusiondirectory.po
index fdfbdce87578b0ed596a0345c015be4801f22e52..6e1d5b44734fb2dfd6aed47dc4dc79583ef73306 100644
--- a/mail/locale/lv/fusiondirectory.po
+++ b/mail/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Pasts"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/nb/fusiondirectory.po b/mail/locale/nb/fusiondirectory.po
index 4736e703075e21e1de3f0a8395d77cae11466ced..bb692e6532b2199e9ede2427eec1eb21044ee9c5 100644
--- a/mail/locale/nb/fusiondirectory.po
+++ b/mail/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Tjener"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/nl/fusiondirectory.po b/mail/locale/nl/fusiondirectory.po
index 053ea92d493b6c41848637d0abae98e5f172b944..937aa5f8b95333d1929f7bd59840fa88ede7b21e 100644
--- a/mail/locale/nl/fusiondirectory.po
+++ b/mail/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Mail fout"
 
@@ -41,166 +41,167 @@ msgstr "Quota gebruik"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "E-mail"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "E-mail instellingen"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
-msgstr ""
+msgstr "E-mail account"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Primair adres"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
-msgstr ""
+msgstr "Primaire e-mail adres"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Server"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Quota grootte"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Alternatieve adressen"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "Stuur berichten door naar"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
-msgstr "Selecteer om automatisch te reageren met het onderstaande afwezigheidsbericht"
+msgstr ""
+"Selecteer om automatisch te reageren met het onderstaande "
+"afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "van"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "tot"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Geavanceerde E-mail opties"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en versturen"
+msgstr ""
+"Selecteer om alleen binnen het eigen domein E-mail te laten ontvangen en "
+"versturen"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Geen aflevering in eigen mailbox"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Selecteer indien u E-mail door wil sturen zonder zelf kopieÃ«n te ontvangen"
+msgstr ""
+"Selecteer indien u E-mail door wil sturen zonder zelf kopieÃ«n te ontvangen"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail methode kan niet verbinden : %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
-msgstr ""
+msgstr "Mailbox \"%s\" bestaat niet op mail sever: %s"
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kan mailbox : %s niet updaten"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kan quota instellingen niet schrijven : %s"
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
-msgstr "Mail fout tijdens het opslagen van sieve instellingen"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
+msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kan mailbox niet verwijderen : %s"
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "De geconfigureerde mail attribuut '%s' is niet ondersteund!"
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "Mail methode '%s' is onbekend!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Geen"
+msgid "Mail method \"%s\" is unknown!"
+msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "Onbeperkt"
 
@@ -291,7 +292,7 @@ msgstr "Het primaire email adres"
 
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server mail"
-msgstr ""
+msgstr "Server e-mail"
 
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative mail addresses for the group"
diff --git a/mail/locale/pl/fusiondirectory.po b/mail/locale/pl/fusiondirectory.po
index 8d62012da7c2afe2d622489d71301896580705b1..c9bf020229742678b668420d2eb1cfc257e239ad 100644
--- a/mail/locale/pl/fusiondirectory.po
+++ b/mail/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,163 @@ msgstr "UÅ¼ycie Quoty"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Poczta"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "Adres podstawowy"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Serwer"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Wybierz serwer poczty ktÃ³ry bÄ™dzie przechowywaÅ‚ skrzynkÄ™ uÅ¼ytkownika"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Rozmiar Quoty"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "Adresy alternatywne"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Lista alternatywnych adresÃ³w pocztowych"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "PrzekaÅ¼ wiadomoÅ›ci do"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "TreÅ›Ä‡ autorespondera"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "WÅ‚Ä…cz autoresponder"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Zaznacz aby automatycznie wysyÅ‚aÄ‡ autoodpowiedÅº zdefiniowanÄ… poniÅ¼ej"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "od"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Zaawansowane opcje poczty"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "UÅ¼ytkownik moÅ¼e tylko wysyÅ‚aÄ‡ i odbieraÄ‡ lokalnÄ… pocztÄ™"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Wybierz jeÅ›li uÅ¼ytkownik moÅ¼e odbieraÄ‡ i wysyÅ‚aÄ‡ w obrÄ™bie wÅ‚asnej domeny"
+msgstr ""
+"Wybierz jeÅ›li uÅ¼ytkownik moÅ¼e odbieraÄ‡ i wysyÅ‚aÄ‡ w obrÄ™bie wÅ‚asnej domeny"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "Nie dostarczaj do wÅ‚asnej skrzynki"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Zaznacz jeÅ›li chcesz przekazywaÄ‡ pocztÄ™ bez zachowania kopii"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/pt/fusiondirectory.po b/mail/locale/pt/fusiondirectory.po
index a55d326e10d53dc0c07304bf507227c93fa0f5a6..c2ae3ab3efba9c677c8f1ed5c392daa326641ab5 100644
--- a/mail/locale/pt/fusiondirectory.po
+++ b/mail/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Correio"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ConfiguraÃ§Ãµes de Correio"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "de"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/pt_BR/fusiondirectory.po b/mail/locale/pt_BR/fusiondirectory.po
index cba721b0a034b2a7e569330cf3b709cf32632eaf..befac87b908a6ca40c42a2858bb167ea40294e68 100644
--- a/mail/locale/pt_BR/fusiondirectory.po
+++ b/mail/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr "Erro de correio"
 
@@ -41,166 +41,164 @@ msgstr "Uso da cota"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Correio"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ConfiguraÃ§Ãµes de correio"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "EndereÃ§o primÃ¡rio"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "servidor"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especifique o servidor de correio que o usuÃ¡rio estÃ¡ hospedado"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Tamanho da cota"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "EndereÃ§os alternativos"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Lista de endereÃ§os alternativos de correio"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Mensagem de fÃ©rias"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "de"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "OpÃ§Ãµes avanÃ§adas de correio"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "UsuÃ¡rio estÃ¡ autorizado somente a enviar e receber emails locais"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Selecione se o usuÃ¡rio deverÃ¡ somente enviar e receber mensagens do prÃ³prio domÃnio"
+msgstr ""
+"Selecione se o usuÃ¡rio deverÃ¡ somente enviar e receber mensagens do prÃ³prio "
+"domÃnio"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "NÃ£o foi possÃvel conectar com este mÃ©todo de correio: %s"
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "NÃ£o Ã© possÃvel atualizar caixa de correio: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Nenhum"
-
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ru/fusiondirectory.po b/mail/locale/ru/fusiondirectory.po
index 77096da4c4573be0d71fb572c4ef49cd74fa07ef..71a32f36a951de2721eb96983b09f8b634b1688a 100644
--- a/mail/locale/ru/fusiondirectory.po
+++ b/mail/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,13 +19,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"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -43,166 +41,164 @@ msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÐºÐ²Ð¾Ñ‚Ñ‹"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð°"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr "ÐŸÐµÑ€Ð²Ð¸Ñ‡Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ ÐºÐ²Ð¾Ñ‚Ñ‹"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¸Ðµ Ð°Ð´Ñ€ÐµÑÐ° Ð¸ Ñ€ÐµÐ´Ð¸Ñ€ÐµÐºÑ‚Ñ‹ (Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ)"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "ÐÐ»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ðµ Ð°Ð´Ñ€ÐµÑÐ°"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð°Ð´Ñ€ÐµÑÐ¾Ð² ÑÐ». Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr "ÐÐ´Ñ€ÐµÑÐ° Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÑÐ»Ð°Ð½Ð¾ "
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸ÐºÐ°"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð¾Ñ‚Ð²ÐµÑ‚Ñ‡Ð¸Ðº Ñ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸ÐµÐ¼, ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ Ð½Ð¸Ð¶Ðµ"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "Ð¾Ñ‚"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "Ð´Ð¾"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ Ð¿Ð¾Ñ‡Ñ‚Ñƒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ð¼Ð¾Ð¶ÐµÑ‚ Ð»Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ ÑÐ²Ð¾ÐµÐ³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð°"
+msgstr ""
+"Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ð¼Ð¾Ð¶ÐµÑ‚ Ð»Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ "
+"Ð²Ð½ÑƒÑ‚Ñ€Ð¸ ÑÐ²Ð¾ÐµÐ³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð°"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "ÐÐµ Ð¾ÑÑ‚Ð°Ð²Ð»ÑÑ‚ÑŒ ÐºÐ¾Ð¿Ð¸Ð¸ Ð² ÑÐ²Ð¾ÐµÐ¼ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¼ ÑÑ‰Ð¸ÐºÐµ"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ, Ð½ÑƒÐ¶Ð½Ð¾ Ð»Ð¸ Ð¾ÑÑ‚Ð°Ð²Ð»ÑÑ‚ÑŒ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÐµÐ¼Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÑ‰Ð¸Ðº \"%s\" Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚ Ð½Ð° Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ðµ: %s"
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÑ‰Ð¸Ðº: %s"
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÐºÐ²Ð¾Ñ‚Ñ‹: \"%s\""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ ÑÑ‰Ð¸Ðº: \"%s\""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
-msgstr "ÐÐµ Ð¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¹ Ð¼ÐµÑ‚Ð¾Ð´ '%s'!"
-
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¹"
 
@@ -261,7 +257,9 @@ msgstr ""
 msgid ""
 "List of personal IMAP folders that should be created along initial account "
 "creation."
-msgstr "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ñ… IMAP Ð¿Ð°Ð¿Ð¾Ðº, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ñ‹ Ð¿Ñ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°."
+msgstr ""
+"Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ñ… IMAP Ð¿Ð°Ð¿Ð¾Ðº, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ñ‹ Ð¿Ñ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ "
+"Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°."
 
 #: config/mail/class_mailPluginConfig.inc:77
 msgid "IMAP timeout"
diff --git a/mail/locale/ru@petr1708/fusiondirectory.po b/mail/locale/ru@petr1708/fusiondirectory.po
index c4963907b743fac2de090a785ee62ef2ad5f8d0f..ce63a76a048dcd18a8e14a853ede50b2467f67ec 100644
--- a/mail/locale/ru@petr1708/fusiondirectory.po
+++ b/mail/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +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"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/sv/fusiondirectory.po b/mail/locale/sv/fusiondirectory.po
index 11a936b88a67ce15d132b60899e6fc4967383604..71aa5ee86fc6d2bc7aedfac07520a4debf9ff9de 100644
--- a/mail/locale/sv/fusiondirectory.po
+++ b/mail/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "Epost"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "Server"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "frÃ¥n"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, php-format
-msgid "Mail method '%s' is unknown!"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:764
-#: personal/mail/class_mail-methods.inc:765
-msgid "None"
-msgstr "Ingen"
-
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "OkÃ¤nd"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/ug/fusiondirectory.po b/mail/locale/ug/fusiondirectory.po
index 3ddebce999ff1d0c766073823ef7e0e28275ac43..b71a035182e4c83e508fe1ab4aafe340ebba53b5 100644
--- a/mail/locale/ug/fusiondirectory.po
+++ b/mail/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +40,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/vi_VN/fusiondirectory.po b/mail/locale/vi_VN/fusiondirectory.po
index 742134078a0bc651f77c7d49b7d897e7d0ba2e94..7f8be79bdf62cbbcefd31053e457f4f860d17832 100644
--- a/mail/locale/vi_VN/fusiondirectory.po
+++ b/mail/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr ""
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "ThÆ°"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "Thiáº¿t láºp mail"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "Tá»«"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr "Lá»—i cáº¥u hÃ¬nh"
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "KhÃ´ng rÃµ"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/locale/zh/fusiondirectory.po b/mail/locale/zh/fusiondirectory.po
index b3f9c5cc8c30c67c494b06dddc3feb01f764d702..7109becef898d3c5207c7554f73791d3c611bed1 100644
--- a/mail/locale/zh/fusiondirectory.po
+++ b/mail/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: personal/mail/class_mailAccount.inc:45
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:241
-#: personal/mail/class_mailAccount.inc:286
-#: personal/mail/class_mailAccount.inc:290
-#: personal/mail/class_mailAccount.inc:294
-#: personal/mail/class_mailAccount.inc:327
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:261
+#: personal/mail/class_mailAccount.inc:329
+#: personal/mail/class_mailAccount.inc:340
+#: personal/mail/class_mailAccount.inc:369
+#: personal/mail/class_mailAccount.inc:373
 msgid "Mail error"
 msgstr ""
 
@@ -41,166 +41,162 @@ msgstr "ä½¿ç”¨ Quota"
 msgid "Part of the quota which is used"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:71
+#: personal/mail/class_mailAccount.inc:73
 #: config/mail/class_mailPluginConfig.inc:28
 #: admin/groups/mail/class_groupMail.inc:46
 msgid "Mail"
 msgstr "é‚®ä»¶"
 
-#: personal/mail/class_mailAccount.inc:72
+#: personal/mail/class_mailAccount.inc:74
 #: config/mail/class_mailPluginConfig.inc:41
 msgid "Mail settings"
 msgstr "é‚®ä»¶é€‰é¡¹"
 
-#: personal/mail/class_mailAccount.inc:94
+#: personal/mail/class_mailAccount.inc:96
 msgid "Mail account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 #: admin/groups/mail/class_groupMail.inc:62
 msgid "Primary address"
 msgstr "ä¸»è¦åœ°å€"
 
-#: personal/mail/class_mailAccount.inc:97
+#: personal/mail/class_mailAccount.inc:99
 msgid "Primary mail address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 #: admin/groups/mail/class_groupMail.inc:66
 msgid "Server"
 msgstr "æœåŠ¡å™¨"
 
-#: personal/mail/class_mailAccount.inc:101
+#: personal/mail/class_mailAccount.inc:103
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "æè¿°è¯¥ç”¨æˆ·è´¦å·æ‰€è¦åˆ›å»ºäºŽçš„é‚®ä»¶æœåŠ¡å™¨"
 
-#: personal/mail/class_mailAccount.inc:106
+#: personal/mail/class_mailAccount.inc:108
 msgid "Quota size"
 msgstr "Quota å¤§å°"
 
-#: personal/mail/class_mailAccount.inc:113
+#: personal/mail/class_mailAccount.inc:115
 msgid "Other addresses and redirections"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 #: admin/groups/mail/class_groupMail.inc:72
 msgid "Alternative addresses"
 msgstr "æ›¿ä»£åœ°å€"
 
-#: personal/mail/class_mailAccount.inc:117
+#: personal/mail/class_mailAccount.inc:119
 msgid "List of alternative mail addresses"
 msgstr "æ›¿ä»£é‚®ä»¶åœ°å€åˆ—è¡¨"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Forward messages to"
 msgstr "è½¬å‘é‚®ä»¶åˆ°"
 
-#: personal/mail/class_mailAccount.inc:122
+#: personal/mail/class_mailAccount.inc:124
 msgid "Addresses to which messages should be forwarded"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:128
-#: personal/mail/class_mailAccount.inc:147
+#: personal/mail/class_mailAccount.inc:130
+#: personal/mail/class_mailAccount.inc:149
 msgid "Vacation message"
 msgstr "å‡æœŸä¿¡æ¯"
 
-#: personal/mail/class_mailAccount.inc:131
+#: personal/mail/class_mailAccount.inc:133
 msgid "Activate vacation message"
 msgstr "å¯ç”¨å‡æœŸä¿¡æ¯"
 
-#: personal/mail/class_mailAccount.inc:132
+#: personal/mail/class_mailAccount.inc:134
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr "é€‰æ‹©ç”¨ä¸‹é¢å®šä¹‰çš„å‡æœŸä¿¡æ¯ä½œä¸ºè‡ªåŠ¨å›žå¤"
 
-#: personal/mail/class_mailAccount.inc:137
+#: personal/mail/class_mailAccount.inc:139
 msgid "from"
 msgstr "ä»Ž"
 
-#: personal/mail/class_mailAccount.inc:142
+#: personal/mail/class_mailAccount.inc:144
 msgid "till"
 msgstr "è‡³"
 
-#: personal/mail/class_mailAccount.inc:153
+#: personal/mail/class_mailAccount.inc:155
 msgid "Advanced mail options"
 msgstr "é«˜çº§é‚®ä»¶é€‰é¡¹"
 
-#: personal/mail/class_mailAccount.inc:161
+#: personal/mail/class_mailAccount.inc:163
 msgid "User is only allowed to send and receive local mails"
 msgstr "ç”¨æˆ·åªèƒ½å‘é€å’ŒæŽ¥æ”¶æœ¬åœ°é‚®ä»¶"
 
-#: personal/mail/class_mailAccount.inc:162
+#: personal/mail/class_mailAccount.inc:164
 msgid "Select if user can only send and receive inside his own domain"
 msgstr "é€‰æ‹©å¦‚æžœç”¨æˆ·åªèƒ½å‘é€å’ŒæŽ¥æ”¶æœ¬åŸŸå†…é‚®ä»¶"
 
-#: personal/mail/class_mailAccount.inc:167
+#: personal/mail/class_mailAccount.inc:169
 msgid "No delivery to own mailbox"
 msgstr "ä¸è¦å‘é€åˆ°æœ¬äººé‚®ç®±"
 
-#: personal/mail/class_mailAccount.inc:168
+#: personal/mail/class_mailAccount.inc:170
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "å¦‚æžœæ‚¨æƒ³è½¬å‘é‚®ä»¶è€Œä¸”ä¸æƒ³ä¿ç•™æ‹·è´çš„è¯ï¼Œè¯·é€‰æ‹©"
 
-#: personal/mail/class_mailAccount.inc:238
-#: personal/mail/class_mailAccount.inc:286
+#: personal/mail/class_mailAccount.inc:258
+#: personal/mail/class_mailAccount.inc:323
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:241
+#: personal/mail/class_mailAccount.inc:261
 #, php-format
 msgid "Mailbox \"%s\" doesn't exists on mail server: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:290
+#: personal/mail/class_mailAccount.inc:326
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:294
+#: personal/mail/class_mailAccount.inc:329
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:307
-msgid "Mail error saving sieve settings"
+#: personal/mail/class_mailAccount.inc:340
+#, php-format
+msgid "Mail error saving sieve settings: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:327
+#: personal/mail/class_mailAccount.inc:369
 #, php-format
 msgid "Cannot remove mailbox, mail method cannot connect: %s"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:331
+#: personal/mail/class_mailAccount.inc:373
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:154
-#: personal/mail/class_mail-methods.inc:516
+#: personal/mail/class_mail-methods.inc:144
+#: personal/mail/class_mail-methods.inc:480
 msgid "Configuration error"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:155
+#: personal/mail/class_mail-methods.inc:145
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:517
+#: personal/mail/class_mail-methods.inc:481
 #, 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"
+msgid "Mail method \"%s\" is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:854
+#: personal/mail/class_mail-methods.inc:725
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
-#: personal/mail/class_mail-methods.inc:856
+#: personal/mail/class_mail-methods.inc:727
 msgid "Unlimited"
 msgstr ""
 
diff --git a/mail/personal/mail/class_mail-methods.inc b/mail/personal/mail/class_mail-methods.inc
index 42b7dc6521c59b03d1b48a6c029c73174d0d1afc..93ef7105eb137ae3d5d6c6b9016486f1eb0b65e3 100644
--- a/mail/personal/mail/class_mail-methods.inc
+++ b/mail/personal/mail/class_mail-methods.inc
@@ -1,9 +1,8 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2017  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,15 +27,13 @@ class mailMethod
   /* Allow modification of the mail server attribute existing mail accounts */
   protected $modifyableServer = TRUE;
 
-  /* Enforces same value for 'mail' as used for 'cn' */
-  protected $mailEqualsCN   = FALSE;
-
   /* the attribute used to create accounts */
-  protected $uattrib        = "mail";
+  /* Naming attribute for accounts, e.g. imap. */
+  protected $uattrib        = 'mail';
 
   /* The account prefixes, keep the '.' here! See FAQ cyrusUseSlashes */
-  protected $user_prefix    = "user.";
-  protected $share_prefix   = "share.";
+  protected $user_prefix    = 'user.';
+  protected $share_prefix   = 'share.';
 
   /* Account ID creation
 
@@ -65,16 +62,13 @@ class mailMethod
    */
   protected $mailSharedPrefix = '';
 
-  /* The atribute mapping for this class  Source --> Destination */
+  /* The attribute mapping for this class  Source --> Destination */
   protected $attributes         = array();
   protected $userObjectClasses  = array();
   protected $shareObjectClasses = array();
 
-  /* Enabled mail domain selection. If enabled getMailDomains() have to return an array
-   *  with the domain parts.
-   */
-  protected $enableDomainSelection  = FALSE;
   protected $enableQuota            = TRUE;
+  protected $enableVacation         = TRUE;
   protected $enableVacationRange    = FALSE;
   protected $enableFolderTypes      = FALSE;
 
@@ -83,29 +77,28 @@ class mailMethod
   protected $quotaUsage   = 0;
 
   /* Method internal */
-  protected $type               = "user";
-  protected $account_id         = "";
-  protected $initial_account_id = "";
+  protected $type               = 'user';
+  protected $account_id         = '';
+  protected $initial_account_id = '';
   protected $connected          = FALSE;
-  protected $error              = "";
+  protected $error              = '';
   protected $parent             = NULL;
 
-  protected $default_acls = array("__anyone__" => "p", "__member__" => "lrswp");
+  protected $default_acls = array('__anyone__' => 'p', '__member__' => 'lrswp');
 
   protected $acl_map = array(
-    "lrsw"      => "read",
-    "lrswp"     => "post",
-    "p"         => "external post",
-    "lrswip"    => "append",
-    "lrswipd"   => "delete",
-    "lrswipcd"  => "write",
-    "lrswipcda" => "admin",
-    " "         => "none"
+    'lrsw'      => 'read',
+    'lrswp'     => 'post',
+    'p'         => 'external post',
+    'lrswip'    => 'append',
+    'lrswipd'   => 'delete',
+    'lrswipcd'  => 'write',
+    'lrswipcda' => 'admin',
+    ' '         => 'none'
   );
 
   protected $acl_mapping = array();
 
-
   /*! \brief  Constructs the mail class
       @param  Object  Plugin  The initator
       @param  String          Open "user" or "group" account.
@@ -115,38 +108,35 @@ class mailMethod
     $this->parent = $parent;
 
     if (!isset($this->parent->gosaMailServer)) {
-      trigger_error("mailMethod with invalid parent object initialized.");
+      trigger_error('mailMethod with invalid parent object initialized.');
     }
 
-    if (!in_array($this->type, array("user","group"))) {
-      trigger_error("Unknown mail class type used '".$type."'.");
+    if (!in_array($this->type, array('user','group'))) {
+      trigger_error('Unknown mail class type used "'.$type.'".');
     } else {
       $this->type = $type;
     }
 
   }
 
-
   /*! \brief  Intialize attributes and config settings.
    */
   protected function init()
   {
     global $config;
-    /* Get config value for cyrusUseSlashes
-     */
-    if ($config->get_cfg_value("cyrusUseSlashes") == "TRUE") {
+    /* Get config value for cyrusUseSlashes */
+    if ($config->get_cfg_value('cyrusUseSlashes') == 'TRUE') {
       $this->cyrusUseSlashes = TRUE;
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "Enabled", "<b>MAIL:</b> cyrusUseSlashes");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, 'Enabled', '<b>MAIL:</b> cyrusUseSlashes');
     } else {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "Disabled", "<b>MAIL:</b> cyrusUseSlashes");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, 'Disabled', '<b>MAIL:</b> cyrusUseSlashes');
     }
 
     /* Check if the mail account identification attribute
-       is overridden in the configuration file
-     */
+       is overridden in the configuration file */
     if ($config->get_cfg_value('mailAttribute', '') != '') {
-      $new_uattrib = strtolower($config->get_cfg_value("mailAttribute"));
-      if (in_array($new_uattrib, array("mail","uid"))) {
+      $new_uattrib = strtolower($config->get_cfg_value('mailAttribute'));
+      if (in_array($new_uattrib, array('mail','uid'))) {
         $this->uattrib = $new_uattrib;
       } else {
         @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>".$new_uattrib."</b>",
@@ -161,24 +151,23 @@ class mailMethod
       $this->acl_mapping[$acl] = _($name);
     }
 
-    /* Check if we have an individual user/folder creation syntax
-     */
-    $tmp = $config->get_cfg_value("mailUserCreation");
+    /* Check if we have an individual user/folder creation syntax */
+    $tmp = $config->get_cfg_value('mailUserCreation');
     if (!empty($tmp)) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<i>".$tmp."</i>",
-          "<b>MAIL:</b> User creation set to");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '<i>'.$tmp.'</i>',
+          '<b>MAIL:</b> User creation set to');
       $this->user_id  = $tmp;
     }
-    $tmp = $config->get_cfg_value("mailFolderCreation");
+    $tmp = $config->get_cfg_value('mailFolderCreation');
     if (!empty($tmp)) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<i>".$tmp."</i>",
-          "<b>MAIL:</b> Shared folder creation set to");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '<i>'.$tmp.'</i>',
+          '<b>MAIL:</b> Shared folder creation set to');
       $this->share_id = $tmp;
     }
-    $tmp = $config->get_cfg_value("mailSharedPrefix");
+    $tmp = $config->get_cfg_value('mailSharedPrefix');
     if (!empty($tmp)) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<i>".$tmp."</i>",
-          "<b>MAIL:</b> Shared folder prefix set to");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '<i>'.$tmp.'</i>',
+          '<b>MAIL:</b> Shared folder prefix set to');
       $this->mailSharedPrefix = $tmp;
     }
 
@@ -186,7 +175,6 @@ class mailMethod
     $this->initial_account_id = $this->account_id;
   }
 
-
   public function fixAttributesOnLoad()
   {
     foreach ($this->attributes as $source => $dest) {
@@ -202,18 +190,10 @@ class mailMethod
     }
   }
 
-
-  public function mailEqualsCN()
-  {
-    return $this->mailEqualsCN;
-  }
-
-
   public function fixAttributesOnRemove()
   {
-    /* Remove objectClasses
-     */
-    if ($this->type == "user") {
+    /* Remove objectClasses */
+    if ($this->type == 'user') {
       $this->parent->attrs['objectClass'] =
         array_remove_entries_ics($this->userObjectClasses, $this->parent->attrs['objectClass']);
     } else {
@@ -238,7 +218,7 @@ class mailMethod
       }
     }
 
-    if ($this->type == "user") {
+    if ($this->type == 'user') {
       $ocs = $this->userObjectClasses;
     } else {
       $ocs = $this->shareObjectClasses;
@@ -251,13 +231,11 @@ class mailMethod
 
     // Add gosaSharedFolderTarget for groups.
     $this->build_account_id();
-    if ($this->type == "group") {
-      $this->parent->attrs['gosaSharedFolderTarget'] =
-        $this->mailSharedPrefix.$this->account_id;
+    if ($this->type == 'group') {
+      $this->parent->attrs['gosaSharedFolderTarget'] = $this->mailSharedPrefix.$this->account_id;
     }
   }
 
-
   /*! \brief  Connect services like imap.
               Not necessary for the base class.
       @return Boolean True if this method is connected else false.
@@ -265,14 +243,13 @@ class mailMethod
   public function connect()
   {
     $this->reset_error();
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, get_class($this), "<b>MAIL: Connect method</b>");
-    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $this->parent->gosaMailServer, "<b>MAIL: Current server</b>");
+    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, get_class($this), '<b>MAIL: Connect method</b>');
+    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $this->parent->gosaMailServer, '<b>MAIL: Current server</b>');
 
     $this->connected = TRUE;
     return TRUE;
   }
 
-
   /*! \brief  Returns the connection status of this method.
       @return Boolean True if this method is connected else false.
    */
@@ -281,7 +258,6 @@ class mailMethod
     return $this->connected;
   }
 
-
   /*! \brief  Disconnect this method. Close services like imap connection.
               Not necessary for the base class.
    */
@@ -289,12 +265,11 @@ class mailMethod
   {
     $this->reset_error();
     if ($this->is_connected()) {
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, get_class($this), "<b>MAIL: Disconnect method</b>");
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, get_class($this), '<b>MAIL: Disconnect method</b>');
       $this->connected = FALSE;
     }
   }
 
-
   /*! \brief  Returns true the current object represents a valid account
               (Some methods may check imap accounts here.)
       @return Boolean TRUE if this is a valid account else FALSE
@@ -305,7 +280,6 @@ class mailMethod
     return TRUE;
   }
 
-
   /*! \brief  Returns the last error occurred
       @return String  The last error message.
    */
@@ -314,36 +288,31 @@ class mailMethod
     return $this->error;
   }
 
-
   public function isModifyableMail()
   {
     return $this->modifyableMail;
   }
 
-
   public function isModifyableServer()
   {
     return $this->modifyableServer;
   }
 
-
   /*! \brief  Returns TRUE if the action caused an error.
       @return Boolean TRUE on error else FALSE
    */
   public function is_error()
   {
-    return ($this->error != "");
+    return ($this->error != '');
   }
 
-
   /*! \brief  Resets the error message.
    */
   public function reset_error()
   {
-    $this->error = "";
+    $this->error = '';
   }
 
-
   public function get_account_id()
   {
     $this->build_account_id();
@@ -420,7 +389,6 @@ class mailMethod
     }
   }
 
-
   /*! \brief  Creates a valid folder id for a given folder name.
                e.g. $folder_id = "INBOX/test"  &&  $this->account_id = "share/mailbox@fusiondirectory.org"
                will result in "share/mailbox/test@fusiondirectory.org"
@@ -462,35 +430,32 @@ class mailMethod
       list($mailpart,$domain) = explode("@", $mail);
     }
 
-    /* Create account_id
-     */
+    /* Create account_id */
     $from   = array("/%cn%/i","/%uid%/i","/%prefix%/i","/%uattrib%/i","/%domain%/i","/%mailpart%/i","/%mail%/i");
     $to     = array($this->parent->cn,$this->parent->uid,$prefix,$this->parent->$uattrib, $domain, $mailpart,$mail);
     $acc_id = trim(strtolower(preg_replace($from, $to, $acc_string)));
 
-    /* Check for not replaced pattern.
-     */
+    /* Check for not replaced pattern */
     if (preg_match("/%/", $acc_id)) {
-      $notr = preg_replace("/^[^%]*/", "", $acc_id);
+      $notr = preg_replace("/^[^%]*/", '', $acc_id);
       if (!empty($notr)) {
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "<b>Warning</b>",
+        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '<b>Warning</b>',
             sprintf("<b>MAIL: WARNING unknown pattern in account creation string '%s' near '%s'</b>", $acc_id, $notr));
 
         /* Remove incomprehensible patterns */
-        $acc_id = preg_replace("/%[^%]+%/", "", $acc_id);
+        $acc_id = preg_replace("/%[^%]+%/", '', $acc_id);
       }
     }
 
     if (preg_match("/\@/", $acc_id)) {
-      list($mail,$domain) = explode("@", $acc_id);
-      $str = trim($mail . $folder . "@" . $domain);
+      list($mail,$domain) = explode('@', $acc_id);
+      $str = trim($mail . $folder . '@' . $domain);
     } else {
       $str = trim($acc_id . $folder);
     }
     return $str;
   }
 
-
   /*! \brief  Returns the configured mail method for the given parent object,
                 initialized and read for use.
       @return mailMethod  The configured mailMethod.
@@ -499,32 +464,29 @@ class mailMethod
   {
     global $config;
     $methods = mailMethod::get_methods();
-    if ($config->get_cfg_value("mailmethod") != "") {
-      $method = $config->get_cfg_value("mailmethod");
-      $cls = get_correct_class_name("mailMethod$method");
+    if ($config->get_cfg_value('mailmethod') != '') {
+      $method = $config->get_cfg_value('mailmethod');
+      $cls = get_correct_class_name('mailMethod$method');
       if (isset($methods[$cls])) {
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $cls, "<b>MAIL:</b> Selected mailMethod");
+        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $cls, '<b>MAIL:</b> Selected mailMethod');
         $tmp = new $cls($this->parent, $this->type);
         $tmp->init();
         return $tmp;
       } else {
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "", "<b>MAIL: Invalid mailMethod defined: ".$cls.
-            " falling back to ".get_class($this)."</b>");
+        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, '', '<b>MAIL: Invalid mailMethod defined: '.$cls.
+            ' falling back to '.get_class($this).'</b>');
 
-        /* Print out configuration errors directly, we can't catch them everywhere.
-         */
-        msg_dialog::display(_("Configuration error"),
-            sprintf(_("Mail method '%s' is unknown!"), $method), ERROR_DIALOG);
+        /* Print out configuration errors directly, we can't catch them everywhere */
+        msg_dialog::display(_('Configuration error'),
+            sprintf(_('Mail method "%s" is unknown!'), $method), ERROR_DIALOG);
       }
     }
 
-    /* If no valued mailMethod could be detected, return the base class.
-     */
+    /* If no valued mailMethod could be detected, return the base class */
     $this->init();
     return $this;
   }
 
-
   /*! \brief Saves sieve settings
    */
   public function saveSieveSettings()
@@ -533,7 +495,6 @@ class mailMethod
     return TRUE;
   }
 
-
   /*! \brief  Creates or Updates the mailAccount represented by this class.
    */
   public function updateMailbox()
@@ -542,16 +503,6 @@ class mailMethod
     return TRUE;
   }
 
-
-  /*! \brief  Update shared folder dependencies
-   */
-  public function updateSharedFolder()
-  {
-    $this->reset_error();
-    return TRUE;
-  }
-
-
   /*! \brief  Removes the mailbox represented by this class,
                and update shared folder ACLs .
    */
@@ -564,7 +515,6 @@ class mailMethod
     return TRUE;
   }
 
-
   /*! \brief  Returns the used mail attribute (mail,uid)
       @param  String  One out of 'mail','uid'
    */
@@ -573,7 +523,6 @@ class mailMethod
     return $this->uattrib;
   }
 
-
   /*! \brief  Returns the used mail attribute (mail,uid)
       @param  String  One out of 'mail','uid'
    */
@@ -583,7 +532,6 @@ class mailMethod
     return $this->parent->$uattrib;
   }
 
-
   /*! \brief  Returns whether the quota settings are enabled or not
       @return Boolean TRUE if enabled else FALSE
    */
@@ -592,7 +540,6 @@ class mailMethod
     return $this->enableQuota;
   }
 
-
   /*! \brief  Returns the used quota
       @return Integer Quota used.
    */
@@ -601,7 +548,6 @@ class mailMethod
     return -1;
   }
 
-
   /*! \brief  Returns the quota restrictions.
       @return Integer Quota restrictions.
    */
@@ -610,7 +556,6 @@ class mailMethod
     return $quotaValue;
   }
 
-
   /*! \brief  Sets the mail quota
    */
   public function setQuota($number)
@@ -625,36 +570,6 @@ class mailMethod
     return TRUE;
   }
 
-
-  /*! \brief  Returns true whether the domain is selectable or not
-   */
-  public function domainSelectionEnabled()
-  {
-    return $this->enableDomainSelection;
-  }
-
-
-  /*! \brief Returns a list of configured mail domains
-      @return Array A list of mail domains
-   */
-  public function getMailDomains()
-  {
-    return array("Unconfigured");
-  }
-
-
-  /*! \brief  Returns the used Spamlevels for this mailmethod
-   */
-  public function getSpamLevels()
-  {
-    $spamlevel = array();
-    for ($i = 0; $i < 21; $i++) {
-      $spamlevel[] = $i;
-    }
-    return $spamlevel;
-  }
-
-
   /*! \brief  Returns the list of configured mailbox folders
       @return Array The mailbox folders.
    */
@@ -663,16 +578,22 @@ class mailMethod
     return array("INBOX");
   }
 
+  /*! \brief  Returns whether the vacation is enabled
+      @return Boolean TRUE, FALSE
+   */
+  public function vacationEnabled()
+  {
+    return $this->enableVacation;
+  }
 
   /*! \brief  Returns whether the vacation range is selectable or not
       @return Boolean TRUE, FALSE
    */
   public function vacationRangeEnabled()
   {
-    return $this->enableVacationRange;
+    return ($this->vacationEnabled() && $this->enableVacationRange);
   }
 
-
   /*! \brief  Checks dependencies to other FusionDirectory plugins.
    */
   public function accountCreateable(&$reason = "")
@@ -680,7 +601,6 @@ class mailMethod
     return TRUE;
   }
 
-
   /*! \brief  Checks whether this account is removeable or not.
               There may be some dependencies left, eg. kolab.
    */
@@ -695,7 +615,6 @@ class mailMethod
   */
   static public function getMailServers()
   {
-    global $config;
     if (session::global_is_set('mailServers')) {
       return session::global_get('mailServers');
     }
@@ -743,7 +662,6 @@ class mailMethod
 
   static public function serverMatch($server)
   {
-    global $config;
     return isset(static::get_server_list()[$server]);
   }
 
@@ -754,39 +672,6 @@ class mailMethod
     return $obj;
   }
 
-  /* \brief   Some method require special folder types, "kolab" for example.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array Return folder types.
-   */
-  public function getAvailableFolderTypes()
-  {
-    $ret = array();
-    $ret['CAT'][''] = _("None");
-    $ret['SUB_CAT'][''][''] = _("None");
-    return $ret;
-  }
-
-
-  /* \brief  Returns the selected folder type.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array  The folde type.
-   */
-  public function getFolderType($default)
-  {
-    return $default;
-  }
-
-
-  /* \brief  Returns the selected folder type.
-      !! Those values are dummy values, the base class doesn't use folder types;
-     @return  Array  The folde type.
-   */
-  public function setFolderType($type)
-  {
-    return TRUE;
-  }
-
-
   /*! \brief  Returns configured acls
    */
   public function  getFolderACLs($folder_acls)
@@ -794,7 +679,7 @@ class mailMethod
     /* Merge given ACL with acl mapping
        This ensures that no ACL will accidentally overwritten by fusiondirectory.
      */
-    foreach ($folder_acls as $user => $acl) {
+    foreach ($folder_acls as $acl) {
       if (!isset($this->acl_mapping[$acl])) {
         $this->acl_mapping[$acl] = $acl;
       }
@@ -803,7 +688,6 @@ class mailMethod
     return $folder_acls;
   }
 
-
   /*! \brief  Write ACLs back to imap or what ever
    */
   public function  setFolderACLs($array)
@@ -811,7 +695,6 @@ class mailMethod
     return TRUE;
   }
 
-
   /*! \brief  Returns a list of all possible acls.
       @return Array   ACLs.
   */
@@ -820,17 +703,6 @@ class mailMethod
     return $this->acl_mapping;
   }
 
-  public function folderTypesEnabled()
-  {
-    return $this->enableFolderTypes;
-  }
-
-  public function allow_remove(&$reason)
-  {
-    return TRUE;
-  }
-
-
   /*! \brief  Returns the configured mailMethod
       @return String  the configured mail method or ""
    */
@@ -847,7 +719,6 @@ class mailMethod
     return "";
   }
 
-
   static function quota_to_image($use, $quota)
   {
     if ($use == -1) {
@@ -897,5 +768,10 @@ class mailMethod
     }
     return $tmp;
   }
+
+  public function additionalInformations()
+  {
+    return array();
+  }
 }
 ?>
diff --git a/mail/personal/mail/class_mailAccount.inc b/mail/personal/mail/class_mailAccount.inc
index 404479e9e73531ca1ea7e2df450acc8c7746789e..f7659b8698f7bda0a1f5c0691d65f6fc3b1736e8 100644
--- a/mail/personal/mail/class_mailAccount.inc
+++ b/mail/personal/mail/class_mailAccount.inc
@@ -62,8 +62,10 @@ class MailQuotaAttribute extends IntAttribute
 
 class mailAccount extends simplePlugin
 {
-  var $displayHeader    = TRUE;
-  var $objectclasses    = array('gosaMailAccount');
+  var $displayHeader  = TRUE;
+  var $objectclasses  = array('gosaMailAccount');
+
+  private $mainSectionAttrs = array();
 
   static function plInfo()
   {
@@ -179,6 +181,8 @@ class mailAccount extends simplePlugin
     global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
 
+    $this->mainSectionAttrs = array_keys($this->attributesInfo['main']['attrs']);
+
     $this->attributesAccess['gosaMailServer']->setChoices(array_keys(mailMethod::getMailServers()));
     $this->attributesAccess['gosaMailServer']->setSubmitForm('mailServerChanged');
     $this->mailServerChanged();
@@ -230,10 +234,26 @@ class mailAccount extends simplePlugin
     $this->mailMethod->fixAttributesOnLoad();
 
     /* Initialize configured values */
-    if ($this->initially_was_account) {
+    if (!$this->is_template && $this->initially_was_account) {
       if ($this->mailMethod->connect() && $this->mailMethod->account_exists()) {
         /* Read quota */
         $this->attributesAccess['gosaMailQuota']->setMailMethod($this->mailMethod);
+        foreach (array_keys($this->attributesInfo['main']['attrs']) as $oldattr) {
+          if (!in_array($oldattr, $this->mainSectionAttrs)) {
+            $this->removeAttribute('main', $oldattr);
+          }
+        }
+        $addInfos = $this->mailMethod->additionalInformations();
+        foreach ($addInfos as $label => $info) {
+          $this->addAttribute(
+            'main',
+            new DisplayAttribute(
+              $label, $label,
+              $label, FALSE,
+              $info
+            )
+          );
+        }
       } elseif (!$this->mailMethod->is_connected()) {
         msg_dialog::display(_('Mail error'), sprintf(_('Mail method cannot connect: %s'),
               $this->mailMethod->get_error()), ERROR_DIALOG);
@@ -246,6 +266,10 @@ class mailAccount extends simplePlugin
       $this->attributesAccess['gosaMailServer']->setDisabled(!$this->mailMethod->isModifyableServer());
     }
 
+    if (!$this->mailMethod->vacationEnabled()) {
+      $this->attributesAccess['flag_vacation']->setValue(FALSE);
+      $this->attributesAccess['flag_vacation']->setDisabled(TRUE);
+    }
     if (!$this->mailMethod->vacationRangeEnabled()) {
       $this->attributesAccess['gosaVacationStart']->setDisabled(TRUE);
       $this->attributesAccess['gosaVacationStart']->setVisible(FALSE);
@@ -275,48 +299,66 @@ class mailAccount extends simplePlugin
     }
   }
 
-  public function save()
+  protected function shouldSave()
+  {
+    /* mail method might have something to save (like password change from main tab for instance) */
+    return TRUE;
+  }
+
+  public function ldap_save()
   {
-    parent::save();
+    if (!empty($this->attrs)) {
+      $errors = parent::ldap_save();
+      if (!empty($errors)) {
+        return $errors;
+      }
+    }
+
+    $errors = array();
 
     /* Only do IMAP actions if we are not a template */
     if (!$this->is_template) {
       $this->mailMethod->connect();
       if (!$this->mailMethod->is_connected()) {
-        msg_dialog::display(_("Mail error"), sprintf(_("Mail method cannot connect: %s"),
-              $this->mailMethod->get_error()), ERROR_DIALOG);
+        $errors[] = sprintf(_('Mail method cannot connect: %s'), $this->mailMethod->get_error());
       } else {
         if (!$this->mailMethod->updateMailbox()) {
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot update mailbox: %s"),
-                $this->mailMethod->get_error()), ERROR_DIALOG);
+          $errors[] = sprintf(_('Cannot update mailbox: %s'), $this->mailMethod->get_error());
         }
         if (!$this->mailMethod->setQuota($this->gosaMailQuota)) {
-          msg_dialog::display(_("Mail error"), sprintf(_("Cannot write quota settings: %s"),
-                $this->mailMethod->get_error()), ERROR_DIALOG);
+          msg_dialog::display(_('Mail error'), sprintf(_('Cannot write quota settings: %s'), $this->mailMethod->get_error()), ERROR_DIALOG);
         }
 
-        if (!is_integer(strpos($this->gosaMailDeliveryMode, "C"))) {
-
+        if (!is_integer(strpos($this->gosaMailDeliveryMode, 'C'))) {
           /* Do not write sieve settings if this account is new and
              doesn't seem to exist. */
           if (!$this->initially_was_account && !$this->mailMethod->account_exists()) {
             @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,
-                "Skipping sieve settings, the account doesn't seem to be created already.</b>", "");
+                'Skipping sieve settings, the account doesnâ€™t seem to be created already.', '');
           } else {
             if (!$this->mailMethod->saveSieveSettings()) {
-              msg_dialog::display(_("Mail error saving sieve settings"), $this->mailMethod->get_error(), ERROR_DIALOG);
+              msg_dialog::display(_('Mail error'), sprintf(_('Mail error saving sieve settings: %s'), $this->mailMethod->get_error()), ERROR_DIALOG);
             }
           }
         } else {
           if ($this->sieve_management) {
             @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,
-                "User uses an own sieve script, skipping sieve update.".$str."</b>", "");
+                'User uses an own sieve script, skipping sieve update.', '');
             $this->sieve_management->save();
           }
         }
       }
     }
     $this->mailMethod->disconnect();
+
+    if (!empty($errors) && !$this->initially_was_account) {
+      /* Mail method failed to create, cancel ldap save */
+      $this->prepareNextCleanup();
+      $this->prepare_remove();
+      $this->ldap_remove();
+    }
+
+    return $errors;
   }
 
   function post_remove()
diff --git a/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc b/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
index b2027d9ef2ad50c0a0be350eb14bf7e277c18da7..45e4d012f82aa7b0ed36c68515cfa3f3f0063005 100644
--- a/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
+++ b/mixedgroups/admin/ogroups/mixedgroups/class_mixedGroup.inc
@@ -20,7 +20,8 @@
 
 class mixedGroup extends simplePlugin
 {
-  var $objectclasses    = array('posixGroup');
+  var $objectclasses  = array('posixGroup');
+  protected $locks    = array();
 
   static function plInfo()
   {
@@ -154,25 +155,11 @@ class mixedGroup extends simplePlugin
       if ($this->attributesAccess['gidNumber']->getInitialValue() != "") {
         $this->gidNumber = $this->attributesAccess['gidNumber']->getInitialValue();
       } else {
-        /* Calculate new id's. We need to place a lock before calling get_next_id
-           to get real unique values.
-         */
-        $wait = 10;
-        while (get_lock("gidnumber") != "") {
-          sleep (1);
-
-          /* Oups - timed out */
-          if ($wait-- == 0) {
-            msg_dialog::display(_("Warning"), _("Timeout while waiting for lock. Ignoring lock!"), WARNING_DIALOG);
-            break;
-          }
-        }
-        add_lock ("gidnumber", "gosa");
-        $this->gidNumber = get_next_id("gidNumber", $this->dn);
+        $this->gidNumber = posixAccount::getNextIdLock('gidNumber', $this->dn);
+        $this->locks[] = 'gidNumber';
       }
     }
 
-    $this->updateAttributesValues();
     parent::prepare_save();
 
     if ($this->trustMode == 'fullaccess') {
@@ -187,10 +174,16 @@ class mixedGroup extends simplePlugin
     }
   }
 
-  protected function post_save()
+  function save()
   {
-    del_lock("gidnumber");
-    parent::post_save();
+    $errors = parent::save();
+
+    foreach ($this->locks as $lock) {
+      del_lock($lock);
+    }
+    $this->locks = array();
+
+    return $errors;
   }
 
   function addUser($dn, $uid)
diff --git a/mixedgroups/locale/ar/fusiondirectory.po b/mixedgroups/locale/ar/fusiondirectory.po
index aef74cc60f0c9a98a28d3fd8571a3897dc6f391c..2d8eb66e9268f95c4800ce58e42ac1b524dc52d9 100644
--- a/mixedgroups/locale/ar/fusiondirectory.po
+++ b/mixedgroups/locale/ar/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "ØªØØ°ÙŠØ±"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/ca/fusiondirectory.po b/mixedgroups/locale/ca/fusiondirectory.po
index 293cb42dee3e9145c9030f6951c3cee327eb658d..ce6db0ba6d1d05b63195477afe2509b89f1d3c79 100644
--- a/mixedgroups/locale/ca/fusiondirectory.po
+++ b/mixedgroups/locale/ca/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "AvÃs"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/cs_CZ/fusiondirectory.po b/mixedgroups/locale/cs_CZ/fusiondirectory.po
index 40647d29bc866699f53e800a0736d7c551edde50..3c3cdcc531e5d8b1a4aca8ee5daa3f7b43d34a97 100644
--- a/mixedgroups/locale/cs_CZ/fusiondirectory.po
+++ b/mixedgroups/locale/cs_CZ/fusiondirectory.po
@@ -1,84 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr "Posix skupina"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr "NastavenÃ posix skupiny"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
-msgstr "Vlastnosti"
+msgstr "vlastnosti"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
-msgstr "Vynutit konkrÃ©tnÃ identifikÃ¡tor skupiny (GID)"
+msgstr "vynutit GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Vynutit konkrÃ©tnÃ identifikÃ¡tor pro tuto skupinu"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "IdentifikÃ¡tor (GID) pro tuto skupinu"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
-msgstr "DÅ¯vÄ›ryhodnost systÃ©mu"
+msgstr "dÅ¯vÄ›ryhodnost systÃ©mÅ¯"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
-msgstr "ReÅ¾im dÅ¯vÄ›ryhodnosti"
+msgstr "reÅ¾im dÅ¯vÄ›ryhodnosti"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Typ ovÄ›Å™ovÃ¡nÃ pro tyto stroje"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
-msgstr "vypnuto"
+msgstr "zakÃ¡zÃ¡no"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "plnÃ½ pÅ™Ãstup"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
-msgstr "umoÅ¾nit pÅ™Ãstup k tÄ›mto strojÅ¯m"
+msgstr "povolit pÅ™Ãstup k tÄ›mto strojÅ¯m"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "TÃ©to skupinÄ› umoÅ¾nit pÅ™ipojenÃ pouze na stroje z tohoto seznamu"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "VarovÃ¡nÃ"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "VyprÅ¡el ÄasovÃ½ limit pÅ™i ÄekÃ¡nÃ na zÃ¡mek â€“ zÃ¡mek proto nebude brÃ¡n v potaz!"
diff --git a/mixedgroups/locale/de/fusiondirectory.po b/mixedgroups/locale/de/fusiondirectory.po
index 46209924e47a881ad141c7a30a9e034e6342abf2..dabaa350e11af977d28a4422f8991b6ec851a6bf 100644
--- a/mixedgroups/locale/de/fusiondirectory.po
+++ b/mixedgroups/locale/de/fusiondirectory.po
@@ -1,84 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr "Posix-Gruppe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr "Posix-Gruppeneinstellungen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
-msgstr "GID erzwingen"
+msgstr "Erzwinge GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "GID-Wert fÃ¼r diese Gruppe erzwingen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "GID-Wert fÃ¼r diese Gruppe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
-msgstr "Systemvertrauen"
+msgstr "System-Vertrauen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
-msgstr "Vertrauensmodus"
+msgstr "Vertrauens-Modus"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Art der Authorisierung fÃ¼r diese Hosts"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Warnung"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Wartezeit fÃ¼r Sperre abgelaufen. Ignoriere Sperre!"
diff --git a/mixedgroups/locale/el_GR/fusiondirectory.po b/mixedgroups/locale/el_GR/fusiondirectory.po
index 9f0f784ea324a034a7f253cfb344234c0dcdd5f7..b0574b65ebf1af8c7ad5f78b0621c6acfb0c1fe5 100644
--- a/mixedgroups/locale/el_GR/fusiondirectory.po
+++ b/mixedgroups/locale/el_GR/fusiondirectory.po
@@ -1,83 +1,77 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¹Î¼Î®Ï‚ GID Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î±"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "Î¤Î¹Î¼Î® GID Î³Î¹Î± Î±Ï…Ï„Î®Î½ Ï„Î·Î½ Î¿Î¼Î¬Î´Î±"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
-msgstr "Î•Ï€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î· ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
+msgstr "Î•Î¼Ï€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î· ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Î›ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± ÎµÏ€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î·Ï‚"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Î¤ÏÏ€Î¿Ï‚ ÎµÎ¾Î¿Ï…ÏƒÎ¹Î¿Î´ÏŒÏ„Î·ÏƒÎ® Î³Î¹Î± Î±Ï…Ï„Î¬ Ï„Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î±"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Î Î»Î®ÏÎ·Ï‚ Î ÏÏŒÏƒÎ²Î±ÏƒÎ·"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Î½Î± ÎµÏ€Î¹Ï„ÏÎ±Ï€ÎµÎ¯ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±Ï…Ï„Î¬ Ï„Î± host"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
-msgstr "Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Î¥Ï€ÎÏÎ²Î±ÏƒÎ· Ï‡ÏÏŒÎ½Î¿Ï… ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± ÎºÎ»ÎÎ¹Î´Ï‰Î¼Î±. Î‘Î³Î½ÏŒÎ·ÏƒÎ· ÎºÎ»ÎµÎ¹Î´ÏŽÎ¼Î±Ï„Î¿Ï‚!"
+msgstr ""
+"Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
diff --git a/mixedgroups/locale/en/fusiondirectory.po b/mixedgroups/locale/en/fusiondirectory.po
index 9385f135ce9c5c772fd5e41894c1bf923718c4ae..a709f6d2987893bad81b62d7b310821e880aff6f 100644
--- a/mixedgroups/locale/en/fusiondirectory.po
+++ b/mixedgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,67 +17,59 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/es/fusiondirectory.po b/mixedgroups/locale/es/fusiondirectory.po
index bb6abb54b0f99855d6eb689124c255913b86bbc4..36dfcb111aac6ab8ef026757dc339ef13ff9a310 100644
--- a/mixedgroups/locale/es/fusiondirectory.po
+++ b/mixedgroups/locale/es/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "desactivado"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera agotado esperando un bloqueo. Â¡Ignorando bloqueo!"
diff --git a/mixedgroups/locale/es_CO/fusiondirectory.po b/mixedgroups/locale/es_CO/fusiondirectory.po
index 274d2bc8314c0ce4691204a56f2a488429e15291..bacebe9eb9830d9d9b87e0a7a1a9dcab8dc56ba2 100644
--- a/mixedgroups/locale/es_CO/fusiondirectory.po
+++ b/mixedgroups/locale/es_CO/fusiondirectory.po
@@ -1,83 +1,77 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Forzar GID para Ã©ste grupo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "Valor GID para Ã©ste grupo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Confianza del Sistema"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Modo de Confianza"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Tipo de autorizaciÃ³n para Ã©sos equipos"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Acceso Completo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Permitir acceso a Ã©sos equipos"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
-msgstr "Habilitar solamente a Ã©ste grupo para conectarse a Ã©sta lista de equipos."
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "PrecacuiÃ³n"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera superado mientras se esperaba el bloqueo. Â¡Ignorando el bloqueo!"
+msgstr ""
+"Habilitar solamente a Ã©ste grupo para conectarse a Ã©sta lista de equipos."
diff --git a/mixedgroups/locale/es_VE/fusiondirectory.po b/mixedgroups/locale/es_VE/fusiondirectory.po
index 62ad47352da0fcec8067bb7765f011a4ab6e431d..3980ffff77472e89f148ed96d147252023dac99a 100644
--- a/mixedgroups/locale/es_VE/fusiondirectory.po
+++ b/mixedgroups/locale/es_VE/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "desactivado"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Tiempo de espera agotado esperando un bloqueo. Â¡Ignorando bloqueo!"
diff --git a/mixedgroups/locale/fa_IR/fusiondirectory.po b/mixedgroups/locale/fa_IR/fusiondirectory.po
index 598953818a34c9599a977b8e5b1bb414a2eb6b0d..2b211db3d5655c4fb94d318848579f1c32be3bd8 100644
--- a/mixedgroups/locale/fa_IR/fusiondirectory.po
+++ b/mixedgroups/locale/fa_IR/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/fi_FI/fusiondirectory.po b/mixedgroups/locale/fi_FI/fusiondirectory.po
index 5fe12c34a22f000506ca88b9215dc0f828f5169a..17cb7f40403bdfed54e3952b2055be1647b21883 100644
--- a/mixedgroups/locale/fi_FI/fusiondirectory.po
+++ b/mixedgroups/locale/fi_FI/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Varoitus"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/fr/fusiondirectory.po b/mixedgroups/locale/fr/fusiondirectory.po
index b763752ed3fa92c1210d99f56f4cd6a3691eb9ef..fc378fdd4304f6cc2c7343b9cabfbc8faa951cca 100644
--- a/mixedgroups/locale/fr/fusiondirectory.po
+++ b/mixedgroups/locale/fr/fusiondirectory.po
@@ -1,85 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr "Groupe POSIX"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr "PrÃ©fÃ©rences des groupes POSIX"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forcer le GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Forcer la valeur du GID pour ce groupe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "GID de ce groupe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
-msgstr "SystÃ¨me de confiance"
+msgstr "SystÃ¨me de Confiance"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Type d'autorisation pour ces hÃ´tes"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "dÃ©sactivÃ©"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "accÃ¨s complet"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "permettre l'accÃ¨s a ces hÃ´tes"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
-msgstr "Autoriser ce groupe Ã  se connecter uniquement sur cette liste d'hÃ´tes"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Avertissement"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Le temps d'attente du verrou a Ã©tÃ© dÃ©passÃ©. Verrou ignorÃ© !"
+msgstr "Autoriser seulement ce groupe Ã  se connecter sur ces listes d'hÃ´tes"
diff --git a/mixedgroups/locale/hu_HU/fusiondirectory.po b/mixedgroups/locale/hu_HU/fusiondirectory.po
index f5c0ba5fefde03b43be95cf91fd73d40e2e9433c..c581573cbbc2d6053d4f123ec81e46b3e2326611 100644
--- a/mixedgroups/locale/hu_HU/fusiondirectory.po
+++ b/mixedgroups/locale/hu_HU/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/id/fusiondirectory.po b/mixedgroups/locale/id/fusiondirectory.po
index 27de43f10ec6bed4a6178b53e7be3d70721cedd8..735ecbeb0846c1309f0467231017e13287868336 100644
--- a/mixedgroups/locale/id/fusiondirectory.po
+++ b/mixedgroups/locale/id/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/it_IT/fusiondirectory.po b/mixedgroups/locale/it_IT/fusiondirectory.po
index 983c30fe78a88bda1399c1ee28e98ca60a106feb..eb55bc1b3302d8f12c3c02366ad57bf5eab50f1c 100644
--- a/mixedgroups/locale/it_IT/fusiondirectory.po
+++ b/mixedgroups/locale/it_IT/fusiondirectory.po
@@ -1,86 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr "Gruppo Posix"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr "Impostazioni gruppo Posix"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "ProprietÃ "
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forza il GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Forzare il valore GID per questo gruppo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "Valore GID per questo gruppo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Sistema di fiducia"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "ModalitÃ  di fiducia"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Tipo di autorizzazione per questi host"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "disattivato"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "accesso completo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "autorizza l'accesso a questi host"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Avvertimento"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Il tempo d'attesa per il blocco Ã¨ scaduto. Blocco ignorato !"
diff --git a/mixedgroups/locale/lv/fusiondirectory.po b/mixedgroups/locale/lv/fusiondirectory.po
index eb81753ce8a6801da734b4727d66694c3c205061..6c1fff5c341b7a6ba9531b52161e4299a4e28825 100644
--- a/mixedgroups/locale/lv/fusiondirectory.po
+++ b/mixedgroups/locale/lv/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "BrÄ«dinÄjums"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/nb/fusiondirectory.po b/mixedgroups/locale/nb/fusiondirectory.po
index 085abb7544c2713c13a00fe3b29b529991a28044..e1d8ced99ef21f136e8ba5099d826f221cb74187 100644
--- a/mixedgroups/locale/nb/fusiondirectory.po
+++ b/mixedgroups/locale/nb/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/nl/fusiondirectory.po b/mixedgroups/locale/nl/fusiondirectory.po
index f2d7fcd59033418ae33e83f8409cdd29d47d00b4..6caef8acc0cefdb857448f3b69cd28a2c925dd5f 100644
--- a/mixedgroups/locale/nl/fusiondirectory.po
+++ b/mixedgroups/locale/nl/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
-msgstr ""
+msgstr "Posix groep"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
-msgstr ""
+msgstr "Posix groep instellingen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Forceer GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
-msgstr ""
+msgstr "GID waarde voor deze groep"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "volledige toegang"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Timeout tijdens het wachten voor een lock. lock is genegeerd!"
diff --git a/mixedgroups/locale/pl/fusiondirectory.po b/mixedgroups/locale/pl/fusiondirectory.po
index 7781af7aea291fc2652b75a88ef43e22539381d1..92f0be7e987b3b9e3e5c78c2b42344bcf5bdef86 100644
--- a/mixedgroups/locale/pl/fusiondirectory.po
+++ b/mixedgroups/locale/pl/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "WymuÅ› GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "wyÅ‚Ä…czone"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "peÅ‚en dostÄ™p"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "zezwÃ³l na dostÄ™p do tych hostÃ³w"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "OstrzeÅ¼enie"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/pt/fusiondirectory.po b/mixedgroups/locale/pt/fusiondirectory.po
index 0224093f2451ca529d14244a713ac2b63690a4bf..5cf65e3329c43f6ce61ec34edae243d3973f95a6 100644
--- a/mixedgroups/locale/pt/fusiondirectory.po
+++ b/mixedgroups/locale/pt/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "ForÃ§ar GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Sistema de confianÃ§a"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Modo de confianÃ§a"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "desabilitado"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "acesso completo"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas mÃ¡quinas"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "AtenÃ§Ã£o"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/pt_BR/fusiondirectory.po b/mixedgroups/locale/pt_BR/fusiondirectory.po
index d14a79db511eb6b09011fb084234d0f16ea09024..bd11e53509be91f46b69e11a328510faf0aa8c78 100644
--- a/mixedgroups/locale/pt_BR/fusiondirectory.po
+++ b/mixedgroups/locale/pt_BR/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "Sistema de confianÃ§a"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Modo de confianÃ§a"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "desabilitado"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Acesso total"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Permitir acesso a esses servidores"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Aviso"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/ru/fusiondirectory.po b/mixedgroups/locale/ru/fusiondirectory.po
index 27cac58ed2f113dfaa688e4fbf1f37ae8550fee2..5171db76b6c2a115a5f20de0a2c037b0a2065bbc 100644
--- a/mixedgroups/locale/ru/fusiondirectory.po
+++ b/mixedgroups/locale/ru/fusiondirectory.po
@@ -1,85 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr "Posix Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Posix Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÑŒ GID Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ GID Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr "GID Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
-msgstr "Ð”Ð¾Ð²ÐµÑ€ÐµÐ½Ð½Ñ‹Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹"
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ðµ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Ð¢Ð¸Ð¿ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð´Ð»Ñ ÑÑ‚Ð¸Ñ… Ñ…Ð¾ÑÑ‚Ð¾Ð²"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð½Ð° ÑÑ‚Ð¸ Ñ…Ð¾ÑÑ‚Ñ‹"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ðº Ñ…Ð¾ÑÑ‚Ð°Ð¼ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸ Ð¸ÑÑ‚ÐµÐºÐ»Ð¾. Ð˜Ð³Ð½Ð¾Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸!"
diff --git a/mixedgroups/locale/ru@petr1708/fusiondirectory.po b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
index b6ed5e5e8800b3e660995f519814267570bd36dd..f97c1b90c8331872ca6b1c862f91530c754b6921 100644
--- a/mixedgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/mixedgroups/locale/ru@petr1708/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/sv/fusiondirectory.po b/mixedgroups/locale/sv/fusiondirectory.po
index 4ea4ef2e22fe04d200f9a1f2a28f845e4489b08b..113146f6a2e0cbaa2705e22212ef6eee94b95553 100644
--- a/mixedgroups/locale/sv/fusiondirectory.po
+++ b/mixedgroups/locale/sv/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Tvinga GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "System trust"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Trust-lÃ¤ge"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr "Auktoriseringstyp fÃ¶r dessa hosts"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "avaktiverad"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "full tillgÃ¥ng"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "tillÃ¥t dessa hosts tillgÃ¥ng"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Varning"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Timeout under vÃ¤ntan pÃ¥ lÃ¥sning. Ignorerar lÃ¥s!"
diff --git a/mixedgroups/locale/ug/fusiondirectory.po b/mixedgroups/locale/ug/fusiondirectory.po
index f3faf1d3103b2794f913d8579dab71632ff631c8..c9269e0e7a86d5ecf6bb87822c14b927248f31cb 100644
--- a/mixedgroups/locale/ug/fusiondirectory.po
+++ b/mixedgroups/locale/ug/fusiondirectory.po
@@ -1,83 +1,75 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/mixedgroups/locale/vi_VN/fusiondirectory.po b/mixedgroups/locale/vi_VN/fusiondirectory.po
index 2fcbe6bdf78c61692b6d411bd72374cff596e396..b7d6ccd4b866a09130e5bde6a3163008b4076abd 100644
--- a/mixedgroups/locale/vi_VN/fusiondirectory.po
+++ b/mixedgroups/locale/vi_VN/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "Properties"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "Ãp dá»¥ng GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "Sá»‘ ID cá»§a nhÃ³m"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "á»¦y thÃ¡c há»‡ thá»‘ng"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "Cháº¿ Ä‘á»™ á»§y thÃ¡c"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "ÄÃ£ vÃ´ hiá»‡u"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "Truy cáºp hoÃ n toÃ n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "Cho phÃ©p truy cáºp Ä‘áº¿n cÃ¡c mÃ¡y chá»§ nÃ y"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "Cáº£nh bÃ¡o"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr "Thá»i gian chá» khÃ³a. Bá» qua khÃ³a!"
diff --git a/mixedgroups/locale/zh/fusiondirectory.po b/mixedgroups/locale/zh/fusiondirectory.po
index 948b056e93a8d3dd9d2b66c07bdb5178c67de8c4..e27a44b308b92eadf04c6cd86ec0f3c44af80558 100644
--- a/mixedgroups/locale/zh/fusiondirectory.po
+++ b/mixedgroups/locale/zh/fusiondirectory.po
@@ -1,83 +1,76 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:28
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
 msgid "Posix group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:29
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:30
 msgid "Posix group settings"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:46
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:47
 msgid "Properties"
 msgstr "å±žæ€§"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID"
 msgstr "å¼ºåˆ¶ GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:49
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:50
 msgid "Force GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:123
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:124
 msgid "GID"
 msgstr "GID"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:53
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:54
 msgid "GID value for this group"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:64
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:65
 msgid "System trust"
 msgstr "ä¿¡èµ–çš„ç³»ç»Ÿ"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Trust mode"
 msgstr "ä¿¡èµ–æ¨¡å¼"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:68
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:69
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "disabled"
 msgstr "ç¦ç”¨"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "full access"
 msgstr "å®Œå…¨è®¿é—®æƒé™"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:72
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:73
 msgid "allow access to these hosts"
 msgstr "å…è®¸è®¿é—®è¿™äº›ä¸»æœº"
 
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:75
+#: admin/ogroups/mixedgroups/class_mixedGroup.inc:76
 msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Warning"
-msgstr "è¦å‘Š"
-
-#: admin/ogroups/mixedgroups/class_mixedGroup.inc:166
-msgid "Timeout while waiting for lock. Ignoring lock!"
-msgstr ""
diff --git a/nagios/locale/ar/fusiondirectory.po b/nagios/locale/ar/fusiondirectory.po
index 84939f8442f3953bad3c625d63e34bd25b854d35..6291f6eadcb9c6149ffef4e0b9b94e8f48a5b7bf 100644
--- a/nagios/locale/ar/fusiondirectory.po
+++ b/nagios/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/ca/fusiondirectory.po b/nagios/locale/ca/fusiondirectory.po
index 6faed6735665e9feb489dc534bcd773cd0f63100..d3740656017d1bcc499a4b4c54238df3bd3a931a 100644
--- a/nagios/locale/ca/fusiondirectory.po
+++ b/nagios/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/cs_CZ/fusiondirectory.po b/nagios/locale/cs_CZ/fusiondirectory.po
index 91e69c10b612e65861ec2d768a6385b3fd00b7ce..f6b0de2474224b6738cb7554e7d0f51643ce1a33 100644
--- a/nagios/locale/cs_CZ/fusiondirectory.po
+++ b/nagios/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,15 +25,15 @@ msgstr "Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:41
 msgid "Nagios account settings"
-msgstr "NastavenÃ ÃºÄtu pro Nagios"
+msgstr "nastavenÃ ÃºÄtu pro Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:60
 msgid "Nagios Account"
-msgstr "ÃšÄet pro Nagios"
+msgstr "ÃºÄet pro Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:63
 msgid "Alias"
-msgstr "AlternativnÃ nÃ¡zev"
+msgstr "alternativnÃ nÃ¡zev (alias)"
 
 #: personal/nagios/class_nagiosAccount.inc:63
 msgid "Name of the nagios alias"
@@ -41,7 +41,7 @@ msgstr "NÃ¡zev alternativnÃho nÃ¡zvu pro nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:67
 msgid "Mail address"
-msgstr "E-mailovÃ¡ adresa"
+msgstr "e-mailovÃ¡ adresa"
 
 #: personal/nagios/class_nagiosAccount.inc:67
 msgid "Email of the nagios alias"
@@ -49,35 +49,35 @@ msgstr "E-mail alternativnÃho nÃ¡zvu sluÅ¾by nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:71
 msgid "Host notification period"
-msgstr "Interval upozorÅˆovÃ¡nÃ stroje"
+msgstr "interval upozorÅˆovÃ¡nÃ na stroj"
 
 #: personal/nagios/class_nagiosAccount.inc:76
 msgid "Service notification period"
-msgstr "Interval upozorÅˆovÃ¡nÃ na sluÅ¾bu"
+msgstr "interval upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
 #: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification options"
-msgstr "PÅ™edvolby upozorÅˆovÃ¡nÃ na sluÅ¾bu"
+msgstr "pÅ™edvolby upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
 #: personal/nagios/class_nagiosAccount.inc:86
 msgid "Host notification options"
-msgstr "PÅ™edvolby upozorÅˆovÃ¡nÃ na stroj"
+msgstr "pÅ™edvolby upozorÅˆovÃ¡nÃ na stroj"
 
 #: personal/nagios/class_nagiosAccount.inc:91
 msgid "Pager"
-msgstr "Pager"
+msgstr "pager"
 
 #: personal/nagios/class_nagiosAccount.inc:91
 msgid " Pager"
-msgstr "Pager"
+msgstr "pager"
 
 #: personal/nagios/class_nagiosAccount.inc:95
 msgid "Service notification commands"
-msgstr "PÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na sluÅ¾bu"
+msgstr "pÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na sluÅ¾bu"
 
 #: personal/nagios/class_nagiosAccount.inc:99
 msgid "Host notification commands"
-msgstr "PÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na stroj"
+msgstr "pÅ™Ãkazy pro upozorÅˆovÃ¡nÃ na stroj"
 
 #: config/nagios/class_nagiosConfig.inc:28
 msgid "Nagios configuration"
diff --git a/nagios/locale/de/fusiondirectory.po b/nagios/locale/de/fusiondirectory.po
index c52e1bcf49279d930bb3dfa0bffe311fe8d2f533..190519c4f0ec167cd5bdb33c47a3a7e15a0f535c 100644
--- a/nagios/locale/de/fusiondirectory.po
+++ b/nagios/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/el_GR/fusiondirectory.po b/nagios/locale/el_GR/fusiondirectory.po
index 4eb7f07e9a3e8694cdeac030588bcc906630464e..57a7f6211ef3c657711a202fafc01ef60a883855 100644
--- a/nagios/locale/el_GR/fusiondirectory.po
+++ b/nagios/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/en/fusiondirectory.po b/nagios/locale/en/fusiondirectory.po
index ee2ab34e52ba4706e11cf1d81d7ffa37b98bbfae..62d8908e261392316eea6d81650a1dcd6884f5f3 100644
--- a/nagios/locale/en/fusiondirectory.po
+++ b/nagios/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/nagios/locale/es/fusiondirectory.po b/nagios/locale/es/fusiondirectory.po
index 20de82680e52a7b4fd78d0cddababff069f72321..1e873191f13abd89a044aaa426d7ac1018184aae 100644
--- a/nagios/locale/es/fusiondirectory.po
+++ b/nagios/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/es_CO/fusiondirectory.po b/nagios/locale/es_CO/fusiondirectory.po
index c15b6fac28a7a6c31326b8a6dd7087372beffbf1..a3bc226d535ffca5f298ea8cd63d32e7c9ffa411 100644
--- a/nagios/locale/es_CO/fusiondirectory.po
+++ b/nagios/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/es_VE/fusiondirectory.po b/nagios/locale/es_VE/fusiondirectory.po
index 0649a15f078e155e724070b45fcd473a76e3269b..df676c15e764a746b2d6cb3b1cb415de53d8223c 100644
--- a/nagios/locale/es_VE/fusiondirectory.po
+++ b/nagios/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/fa_IR/fusiondirectory.po b/nagios/locale/fa_IR/fusiondirectory.po
index 0577131c9e1df8bc920ae930bc2665c4aa5b981a..e20083952b5e5737f78a17ff7f9ada8dba75f5f8 100644
--- a/nagios/locale/fa_IR/fusiondirectory.po
+++ b/nagios/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/fi_FI/fusiondirectory.po b/nagios/locale/fi_FI/fusiondirectory.po
index 69c6d2a476f9d14aa51790d7331b5164da93624e..cbd1c80e900a292c88c13a70f10d04caf84956bd 100644
--- a/nagios/locale/fi_FI/fusiondirectory.po
+++ b/nagios/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/fr/fusiondirectory.po b/nagios/locale/fr/fusiondirectory.po
index aa15f1eda8db4113bb755fb62f2d5be18c7b6e04..c93136d955f0cae861dc2f788a13a558e0a35a02 100644
--- a/nagios/locale/fr/fusiondirectory.po
+++ b/nagios/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr "Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:41
 msgid "Nagios account settings"
-msgstr "ParamÃ¨tres du compte Nagios"
+msgstr "ParamÃ¨tres Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:60
 msgid "Nagios Account"
@@ -33,7 +33,7 @@ msgstr "Compte Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:63
 msgid "Alias"
-msgstr "Alias"
+msgstr "Alias de l'utilisateur"
 
 #: personal/nagios/class_nagiosAccount.inc:63
 msgid "Name of the nagios alias"
@@ -41,11 +41,11 @@ msgstr "Nom de l'alias Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:67
 msgid "Mail address"
-msgstr "Courriel"
+msgstr "Adresse de messagerie"
 
 #: personal/nagios/class_nagiosAccount.inc:67
 msgid "Email of the nagios alias"
-msgstr "Courriel de l'alias Nagios"
+msgstr "Adresses de messagerie de l'alias Nagios"
 
 #: personal/nagios/class_nagiosAccount.inc:71
 msgid "Host notification period"
@@ -57,11 +57,11 @@ msgstr "PÃ©riode de notification pour les services"
 
 #: personal/nagios/class_nagiosAccount.inc:81
 msgid "Service notification options"
-msgstr "Options de notification pour les services"
+msgstr "Options pour la pÃ©riode de notification pour les services"
 
 #: personal/nagios/class_nagiosAccount.inc:86
 msgid "Host notification options"
-msgstr "Options de notification pour les systÃ¨mes"
+msgstr "Options pour la notification des systÃ¨mes"
 
 #: personal/nagios/class_nagiosAccount.inc:91
 msgid "Pager"
diff --git a/nagios/locale/hu_HU/fusiondirectory.po b/nagios/locale/hu_HU/fusiondirectory.po
index c8104d78d2dc7c669af6b184f86e7b25706e1937..b04db119df5364f961a42043100c27eafc21945c 100644
--- a/nagios/locale/hu_HU/fusiondirectory.po
+++ b/nagios/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/id/fusiondirectory.po b/nagios/locale/id/fusiondirectory.po
index 1419bf546156a41a381ad19e532b7743cf86a0a8..c822d286731d4ef98c59826d0d8f35fd2066876f 100644
--- a/nagios/locale/id/fusiondirectory.po
+++ b/nagios/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/it_IT/fusiondirectory.po b/nagios/locale/it_IT/fusiondirectory.po
index 0b9d24d590bf3b4f47b64ecc3cc358e7e027e0ef..0387080dd7189fde5055f565f3b71e911751e24c 100644
--- a/nagios/locale/it_IT/fusiondirectory.po
+++ b/nagios/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/lv/fusiondirectory.po b/nagios/locale/lv/fusiondirectory.po
index 323e3b70fbd4b532873b8d5d46961d3142f05f4f..a8e0c70dd47b1f50024100636c2dc885e4926593 100644
--- a/nagios/locale/lv/fusiondirectory.po
+++ b/nagios/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/nb/fusiondirectory.po b/nagios/locale/nb/fusiondirectory.po
index f68a399503c68fbbb06af7af2dde3ddd76ad0e59..128c819de8b9e1fdb03f74dc491000f66d3dc400 100644
--- a/nagios/locale/nb/fusiondirectory.po
+++ b/nagios/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/nl/fusiondirectory.po b/nagios/locale/nl/fusiondirectory.po
index f05be65df815ec173ed9e87e478ce6d4ff7b0c7d..32fec43b75e50c345e7cc277cc80395a98da8325 100644
--- a/nagios/locale/nl/fusiondirectory.po
+++ b/nagios/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/pl/fusiondirectory.po b/nagios/locale/pl/fusiondirectory.po
index 1e3fb789f8b7d5685d73d0606345e75912185def..d679a1cd39530ed2edcfe42cc64e41eef829e790 100644
--- a/nagios/locale/pl/fusiondirectory.po
+++ b/nagios/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/pt/fusiondirectory.po b/nagios/locale/pt/fusiondirectory.po
index 04cdbbe11b49c63d8d5b946a40589bdb8aadb7cd..c547a1de64a038c8ce0c7590cc7d1a5a6ec25470 100644
--- a/nagios/locale/pt/fusiondirectory.po
+++ b/nagios/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/pt_BR/fusiondirectory.po b/nagios/locale/pt_BR/fusiondirectory.po
index 7bac0733cc4f9a7bf4806c5da94ce9579373923b..85ab3ba1015a16bc49a0f61e328cd523ac269e93 100644
--- a/nagios/locale/pt_BR/fusiondirectory.po
+++ b/nagios/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/ru/fusiondirectory.po b/nagios/locale/ru/fusiondirectory.po
index 254594f7bb436fb2c3f25aee7634b03dcf4940c8..93b9eddbc2a0183842362792e16eb9c0dc77bbcf 100644
--- a/nagios/locale/ru/fusiondirectory.po
+++ b/nagios/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/ru@petr1708/fusiondirectory.po b/nagios/locale/ru@petr1708/fusiondirectory.po
index ccdcd35d468bdbdaab8362c85a3c7b5b5b0238b0..38ee5fa8875a174fe28bbf20a12e47cbd1827336 100644
--- a/nagios/locale/ru@petr1708/fusiondirectory.po
+++ b/nagios/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/sv/fusiondirectory.po b/nagios/locale/sv/fusiondirectory.po
index 6c30d44a20fa59dd1138c004ccc380474cd2351f..a3c35b7bc933587af3d49e9eb675d64231aa356b 100644
--- a/nagios/locale/sv/fusiondirectory.po
+++ b/nagios/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/ug/fusiondirectory.po b/nagios/locale/ug/fusiondirectory.po
index f449727f04f16699d18d181c8aee53ac6cf3b90b..3d357555d3adb34dcee74525316262fb2e9dc462 100644
--- a/nagios/locale/ug/fusiondirectory.po
+++ b/nagios/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/vi_VN/fusiondirectory.po b/nagios/locale/vi_VN/fusiondirectory.po
index 4127e383714f2f42fb1ee7e75336e2527c62da54..5953ac7eb954fe3f4e7b88d4b47b139e7b7da1cf 100644
--- a/nagios/locale/vi_VN/fusiondirectory.po
+++ b/nagios/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/nagios/locale/zh/fusiondirectory.po b/nagios/locale/zh/fusiondirectory.po
index 7340c3390bdde38b32c46350427a01408597f7b4..9cf5283d8e6d60570571f801af73368cdabc654a 100644
--- a/nagios/locale/zh/fusiondirectory.po
+++ b/nagios/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/admin/netgroups/class_netgroupManagement.inc b/netgroups/admin/netgroups/class_netgroupManagement.inc
index 1ae99d83fdec95163f91e637b3193e3851a2a760..6cfe37c191442eb079b3576ad9725d3d68552c4c 100644
--- a/netgroups/admin/netgroups/class_netgroupManagement.inc
+++ b/netgroups/admin/netgroups/class_netgroupManagement.inc
@@ -21,7 +21,7 @@
 
 class netgroupManagement extends simpleManagement
 {
-  /* Tab definition */
+  // Tab definition
   protected $objectTypes  = array('netgroup');
 
   protected $departmentBrowser      = TRUE;
diff --git a/netgroups/locale/ar/fusiondirectory.po b/netgroups/locale/ar/fusiondirectory.po
index aa0f9041dc3432147af7ce8ac672ec18ebbac3f6..b339a8ba8194fc733ca5abb97ae94b7a4113efc8 100644
--- a/netgroups/locale/ar/fusiondirectory.po
+++ b/netgroups/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ca/fusiondirectory.po b/netgroups/locale/ca/fusiondirectory.po
index 077f007ae13e887d377ddb5552fe45aa25dedddd..0002b118ea6672ab11b40a2460b1289795fba8e8 100644
--- a/netgroups/locale/ca/fusiondirectory.po
+++ b/netgroups/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/cs_CZ/fusiondirectory.po b/netgroups/locale/cs_CZ/fusiondirectory.po
index 65e5bdd3853994a1f9eba1a61d9b1010da968760..cb52dc3b1e55cb0fb06582815c4862e9534e95ae 100644
--- a/netgroups/locale/cs_CZ/fusiondirectory.po
+++ b/netgroups/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,12 +22,12 @@ msgstr ""
 #: admin/netgroups/class_netgroup.inc:54
 #: admin/systems/netgroups/class_netgroupSystem.inc:26
 msgid "NIS Netgroup"
-msgstr "SÃÅ¥ovÃ¡ skupina v NIS"
+msgstr "skupina v NIS"
 
 #: personal/netgroups/class_netgroupMembership.inc:44
 #: admin/systems/netgroups/class_netgroupSystem.inc:27
 msgid "NIS Netgroup member"
-msgstr "ÄŒlen sÃÅ¥ovÃ© skupiny NIS"
+msgstr "Älen skupiny NIS"
 
 #: personal/netgroups/class_netgroupMembership.inc:60
 msgid "Member of the following NIS Netgroups  "
@@ -67,7 +68,7 @@ msgstr "informace"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/netgroups/class_netgroup.inc:72
 msgid "Name of this NIS netgroup"
@@ -75,7 +76,7 @@ msgstr "NÃ¡zev tÃ©to NIS sÃÅ¥ovÃ© skupiny"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/netgroups/class_netgroup.inc:75
 msgid "Description of this NIS netgroup"
@@ -100,7 +101,7 @@ msgstr "ÄŒlenovÃ© sÃÅ¥ovÃ© skupiny"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
-msgstr "Skupiny NIS"
+msgstr "skupiny NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
diff --git a/netgroups/locale/de/fusiondirectory.po b/netgroups/locale/de/fusiondirectory.po
index 0048cc0aa31b2635758e0f85c0fef2387edd6039..34285469119ce99b5d95915e8a747dcbd941ec7d 100644
--- a/netgroups/locale/de/fusiondirectory.po
+++ b/netgroups/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/el_GR/fusiondirectory.po b/netgroups/locale/el_GR/fusiondirectory.po
index 6d5cd1688a056fa163571e897e4db38b58f0eee5..81a411876c589a4b9beb5d9601d3d09a0bbc061a 100644
--- a/netgroups/locale/el_GR/fusiondirectory.po
+++ b/netgroups/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/en/fusiondirectory.po b/netgroups/locale/en/fusiondirectory.po
index 79ec6b0a226e903f271c98d6737965c23df2c9f4..7c453cd4ca4edb79c89cece405b6b293b5d29bcc 100644
--- a/netgroups/locale/en/fusiondirectory.po
+++ b/netgroups/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/netgroups/locale/es/fusiondirectory.po b/netgroups/locale/es/fusiondirectory.po
index e3d2b3fece1e95ad8f6a674e021eef9a9ac1ef60..c2e6875c167a02147617d0fecfa52cc0e8fe67e5 100644
--- a/netgroups/locale/es/fusiondirectory.po
+++ b/netgroups/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/es_CO/fusiondirectory.po b/netgroups/locale/es_CO/fusiondirectory.po
index e6deed66da2ec0fbad4a4c8b160403be4d5fa2b5..691585cfcc370540192998bb7af6438a76960257 100644
--- a/netgroups/locale/es_CO/fusiondirectory.po
+++ b/netgroups/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/es_VE/fusiondirectory.po b/netgroups/locale/es_VE/fusiondirectory.po
index 74b25c245f762ddbac8fb88a8cf55c09f4d7a36c..03498aacad4ed639fa59525d66ae2e418a0a3913 100644
--- a/netgroups/locale/es_VE/fusiondirectory.po
+++ b/netgroups/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/fa_IR/fusiondirectory.po b/netgroups/locale/fa_IR/fusiondirectory.po
index 54b81f64a3062039dc6b1e79f729fa195a7ea517..156a5fc7af84b50da69805ed390f28516cb9fe1a 100644
--- a/netgroups/locale/fa_IR/fusiondirectory.po
+++ b/netgroups/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/fi_FI/fusiondirectory.po b/netgroups/locale/fi_FI/fusiondirectory.po
index b56f5af32d430e5923157d4a87781f40b804fd71..2fdf99a9282e306694511c486ccfd1e14f1d78e7 100644
--- a/netgroups/locale/fi_FI/fusiondirectory.po
+++ b/netgroups/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/fr/fusiondirectory.po b/netgroups/locale/fr/fusiondirectory.po
index f1ecf9c69b0207c35c863abdf579884d89c4a5ff..d2b79b2a2cf5fa5ae9dcdd3a8cbb7b899cfbc60e 100644
--- a/netgroups/locale/fr/fusiondirectory.po
+++ b/netgroups/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,7 +35,7 @@ msgstr "Membre des groupes NIS suivants"
 
 #: personal/netgroups/class_netgroupMembership.inc:63
 msgid "NIS netgroup membership"
-msgstr "Appartenance Ã  un groupe NIS"
+msgstr "Membre d'un groupe NIS"
 
 #: config/netgroups/class_netgroupConfig.inc:28
 msgid "Netgroup configuration"
@@ -52,11 +52,11 @@ msgstr "Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Netgroup RDN"
-msgstr "Branche des objets Netgroup"
+msgstr "Chemin relatif des objets Netgroup"
 
 #: config/netgroups/class_netgroupConfig.inc:45
 msgid "Branch in which netgroups will be stored"
-msgstr "Branches oÃ¹ seront stockÃ©s les objets Netgroup"
+msgstr "Branches ou seront stockÃ©s les objets Netgroup"
 
 #: admin/netgroups/class_netgroup.inc:51
 msgid "NIS Netgroup settings"
@@ -84,20 +84,20 @@ msgstr "Description du groupe NIS"
 
 #: admin/netgroups/class_netgroup.inc:81
 msgid "User members"
-msgstr "Utilisateurs membres"
+msgstr "Membre du groupe"
 
 #: admin/netgroups/class_netgroup.inc:88 admin/netgroups/class_netgroup.inc:97
 #: admin/netgroups/class_netgroup.inc:104
 msgid "NIS netgroup members"
-msgstr "Utilisateurs membres du groupe NIS"
+msgstr "Membres d'un groupe NIS"
 
 #: admin/netgroups/class_netgroup.inc:94
 msgid "System members"
-msgstr "SystÃ¨mes membres"
+msgstr "SystÃ¨mes qui ont membres"
 
 #: admin/netgroups/class_netgroup.inc:101
 msgid "Netgroup members"
-msgstr "SystÃ¨mes membres du groupe NIS"
+msgstr "Membres d'un groupe NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:34
 msgid "NIS Netgroups"
@@ -105,4 +105,4 @@ msgstr "Groupes NIS"
 
 #: admin/netgroups/class_netgroupManagement.inc:35
 msgid "NIS Netgroup management"
-msgstr "Gestion des groupes NIS"
+msgstr "Gestion des groupes nis"
diff --git a/netgroups/locale/hu_HU/fusiondirectory.po b/netgroups/locale/hu_HU/fusiondirectory.po
index 747a2da6a8f97d4285beec4986bd96bb7bd3480c..d24813e41b54b0b5b15be90099f629f181d9a89a 100644
--- a/netgroups/locale/hu_HU/fusiondirectory.po
+++ b/netgroups/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/id/fusiondirectory.po b/netgroups/locale/id/fusiondirectory.po
index 53191622735ef9954fe93939321db5e597e04667..3b71b140ebbd7008d9f990965591513ffa323389 100644
--- a/netgroups/locale/id/fusiondirectory.po
+++ b/netgroups/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/it_IT/fusiondirectory.po b/netgroups/locale/it_IT/fusiondirectory.po
index 044a815483f94d894167a3096ce5f4c78c0a1eba..38853d5d7669a44c0968cc666743f215b1880c75 100644
--- a/netgroups/locale/it_IT/fusiondirectory.po
+++ b/netgroups/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/lv/fusiondirectory.po b/netgroups/locale/lv/fusiondirectory.po
index 5790fdd9bff71d92279c256fd05d86e94ec12a2f..7060d3d8641d90e24f1e72d61ee6cff2a5e06be8 100644
--- a/netgroups/locale/lv/fusiondirectory.po
+++ b/netgroups/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/nb/fusiondirectory.po b/netgroups/locale/nb/fusiondirectory.po
index f38fc448d067fba52f7e70fa8ea69442825892f8..4a244e3f955340de99ffece736e9009f56aea789 100644
--- a/netgroups/locale/nb/fusiondirectory.po
+++ b/netgroups/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/nl/fusiondirectory.po b/netgroups/locale/nl/fusiondirectory.po
index c242974f428e64d1f6616f36c6173e262fc8cded..c3f11b93b1e0989e2789755beef3c985841b3523 100644
--- a/netgroups/locale/nl/fusiondirectory.po
+++ b/netgroups/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/pl/fusiondirectory.po b/netgroups/locale/pl/fusiondirectory.po
index 1dfde177633f617e61953525c1d432c13025674a..702eb94afecaed3953a6bae76acfb9bb482e92fd 100644
--- a/netgroups/locale/pl/fusiondirectory.po
+++ b/netgroups/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/pt/fusiondirectory.po b/netgroups/locale/pt/fusiondirectory.po
index e0313f21aec21867a7ef1807b8f36447c9cdfe0d..8b1561789d3af81ef5ac7962bccecf88d0520980 100644
--- a/netgroups/locale/pt/fusiondirectory.po
+++ b/netgroups/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/pt_BR/fusiondirectory.po b/netgroups/locale/pt_BR/fusiondirectory.po
index 23ab57845bf5b2cc457c0a487e60e337c947ec1f..3826122ae5624c06d90f515ed45116e7e14f1d21 100644
--- a/netgroups/locale/pt_BR/fusiondirectory.po
+++ b/netgroups/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ru/fusiondirectory.po b/netgroups/locale/ru/fusiondirectory.po
index 281696c6202bdf0d3b5bf5d3deada0e71c5ce8dc..88ded91f625a93d39d27edf0c20aaee8157d951a 100644
--- a/netgroups/locale/ru/fusiondirectory.po
+++ b/netgroups/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ru@petr1708/fusiondirectory.po b/netgroups/locale/ru@petr1708/fusiondirectory.po
index 33dc9ca5c8b69979e62cde294f6521620a3a7931..376ea61c4ff6da58964d041d335ed6bd5d54416c 100644
--- a/netgroups/locale/ru@petr1708/fusiondirectory.po
+++ b/netgroups/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/sv/fusiondirectory.po b/netgroups/locale/sv/fusiondirectory.po
index 6010ca2b49351d7ca3533af0cc2dcd47e96e6acf..5d7abed9dd6aa699baf6d9ab81a69fe64bd4a03a 100644
--- a/netgroups/locale/sv/fusiondirectory.po
+++ b/netgroups/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/ug/fusiondirectory.po b/netgroups/locale/ug/fusiondirectory.po
index a08f07761bc78bd075efacda704a9ff6e74d1f4c..b99a4d5277b30b820a1289a462c420dbc1c57a02 100644
--- a/netgroups/locale/ug/fusiondirectory.po
+++ b/netgroups/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/vi_VN/fusiondirectory.po b/netgroups/locale/vi_VN/fusiondirectory.po
index 95f2ba94ae493aadacc5ee7953914c16c29b2328..159e3549abecf364df55e7721636912610c2aad9 100644
--- a/netgroups/locale/vi_VN/fusiondirectory.po
+++ b/netgroups/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/locale/zh/fusiondirectory.po b/netgroups/locale/zh/fusiondirectory.po
index ae5054018db704a1583910ae928bf91d2c2b1e5d..149970dfc7e7163ac30a4b4a5f9cf470da84d1b4 100644
--- a/netgroups/locale/zh/fusiondirectory.po
+++ b/netgroups/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/netgroups/personal/netgroups/class_netgroupMembership.inc b/netgroups/personal/netgroups/class_netgroupMembership.inc
index 20e298a97c745f9558d165c8ca5022dd161b6b06..a42fdd1d981b564a2a8926a51ecd210300200fae 100644
--- a/netgroups/personal/netgroups/class_netgroupMembership.inc
+++ b/netgroups/personal/netgroups/class_netgroupMembership.inc
@@ -151,7 +151,7 @@ class netgroupMembership extends simplePlugin {
   }
 
   /* Save data to LDAP, depending on is_account we save or delete */
-  function ldap_save($cleanup = TRUE)
+  function ldap_save()
   {
     global $config;
     $this->update_id();
diff --git a/newsletter/locale/ar/fusiondirectory.po b/newsletter/locale/ar/fusiondirectory.po
index b90b4f42b5fa75f8e877a9279d1ce93ca362f252..b8df4459f8a192e5c542f69c7b5f53b4e7aa5600 100644
--- a/newsletter/locale/ar/fusiondirectory.po
+++ b/newsletter/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/ca/fusiondirectory.po b/newsletter/locale/ca/fusiondirectory.po
index 4c04f0ff9073a330ebc0b79527d71cabe62bc2b9..a6d1c1c300e000297c461d15a0d8a4612290425f 100644
--- a/newsletter/locale/ca/fusiondirectory.po
+++ b/newsletter/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/cs_CZ/fusiondirectory.po b/newsletter/locale/cs_CZ/fusiondirectory.po
index 6bc7ce27bac3a452604ec660aa6f843a3eacb41f..afa387995c87a30b8b665bd67c1e928d98c0cc52 100644
--- a/newsletter/locale/cs_CZ/fusiondirectory.po
+++ b/newsletter/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/de/fusiondirectory.po b/newsletter/locale/de/fusiondirectory.po
index 969b7587037b118643b06b19c4ba9224f054b117..ba51c6772c22f2ec496304c59fbde9b2ec34b0d3 100644
--- a/newsletter/locale/de/fusiondirectory.po
+++ b/newsletter/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/el_GR/fusiondirectory.po b/newsletter/locale/el_GR/fusiondirectory.po
index 412e5242e6b407cb5e9e7e8060d5641fad85593a..97cdcd1193c37ce4052a89ee8740bbd86904dc67 100644
--- a/newsletter/locale/el_GR/fusiondirectory.po
+++ b/newsletter/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/en/fusiondirectory.po b/newsletter/locale/en/fusiondirectory.po
index cbda0bb712648ed37107c5a2c1b6014676b95387..95c593db4ac285ea07dffb5bd15f1f5ad23aec3e 100644
--- a/newsletter/locale/en/fusiondirectory.po
+++ b/newsletter/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/newsletter/locale/es/fusiondirectory.po b/newsletter/locale/es/fusiondirectory.po
index bf90d3eb5460e5882e5fe0f0a4514beb9b45ad7a..70db12c2c8985c53a8f3c6498107f7dd7ae342b5 100644
--- a/newsletter/locale/es/fusiondirectory.po
+++ b/newsletter/locale/es/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/es_CO/fusiondirectory.po b/newsletter/locale/es_CO/fusiondirectory.po
index 8e46c17cda8dd2bb2be7b122085f1f03516ec028..f835dce98cfa2c0f21508f3626d6f1909e0aed97 100644
--- a/newsletter/locale/es_CO/fusiondirectory.po
+++ b/newsletter/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/es_VE/fusiondirectory.po b/newsletter/locale/es_VE/fusiondirectory.po
index 6a9b3cdba6fe3f02a9678720d48ea8ee7caf044d..2e6e4b0eeb592f561ad9052f3d2a32fa5a75d8a1 100644
--- a/newsletter/locale/es_VE/fusiondirectory.po
+++ b/newsletter/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/fa_IR/fusiondirectory.po b/newsletter/locale/fa_IR/fusiondirectory.po
index 641e6506b05838ae9dea5faa173417bd90a09a58..f9ebd5da3f3d585149b83b42a887e7dc1ad70bf0 100644
--- a/newsletter/locale/fa_IR/fusiondirectory.po
+++ b/newsletter/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/fi_FI/fusiondirectory.po b/newsletter/locale/fi_FI/fusiondirectory.po
index 0a56001883bda0c9457363a0d2ea55dad1f044fd..6d0e58e95e49d4d7a7ea254bce581869fbda8d26 100644
--- a/newsletter/locale/fi_FI/fusiondirectory.po
+++ b/newsletter/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/fr/fusiondirectory.po b/newsletter/locale/fr/fusiondirectory.po
index 1081b82c201a2eda7e7610259ea94ad2b3f210b7..76bd58557ea84d1f4186d667738d916a44865609 100644
--- a/newsletter/locale/fr/fusiondirectory.po
+++ b/newsletter/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +29,7 @@ msgstr "Abonnement au bulletin d'actualitÃ©s"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:46
 msgid "Personal info"
-msgstr "Infos personnelles"
+msgstr "Informations personnelles"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:50
 msgid "Subscriptions"
diff --git a/newsletter/locale/hu_HU/fusiondirectory.po b/newsletter/locale/hu_HU/fusiondirectory.po
index 7aab0ecafddb9c8de3be0f7778c6937b73dbde73..c93c9f737020330cdbecaf117f74377e5a474c76 100644
--- a/newsletter/locale/hu_HU/fusiondirectory.po
+++ b/newsletter/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/id/fusiondirectory.po b/newsletter/locale/id/fusiondirectory.po
index 4bcf5b376088b39f9aa16e86a836e9586bbb8fec..6954a7c0e84a2bfe6afe2e9f248f6a3c3a82e0a5 100644
--- a/newsletter/locale/id/fusiondirectory.po
+++ b/newsletter/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/it_IT/fusiondirectory.po b/newsletter/locale/it_IT/fusiondirectory.po
index 29fcb45f0109551dc30c160ff5567c1088c675d5..bdfcafd03f19a9c5b8c1c8f23987d0b0153749d1 100644
--- a/newsletter/locale/it_IT/fusiondirectory.po
+++ b/newsletter/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-03-07 12:58+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/lv/fusiondirectory.po b/newsletter/locale/lv/fusiondirectory.po
index 8b7f9a5b9a42e1690da8f02d20527b8c49e6bd80..69cdc6464fd1b3c181ac0ef53a7d454640d02d90 100644
--- a/newsletter/locale/lv/fusiondirectory.po
+++ b/newsletter/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/nb/fusiondirectory.po b/newsletter/locale/nb/fusiondirectory.po
index 205cde28b149fa7c0e1204d48483df10b196889e..18a94543d4d6021ad361c760f9aca614446a8dee 100644
--- a/newsletter/locale/nb/fusiondirectory.po
+++ b/newsletter/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/nl/fusiondirectory.po b/newsletter/locale/nl/fusiondirectory.po
index a68314213a2b4f800d70467d5da3e781730763b4..3367c362d895ba3460761878c68a1a0b376f754e 100644
--- a/newsletter/locale/nl/fusiondirectory.po
+++ b/newsletter/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,36 +21,36 @@ msgstr ""
 #: personal/newsletter/class_newsletterSubscriptions.inc:30
 #: config/newsletter/class_newsletterConfig.inc:41
 msgid "Newsletter"
-msgstr ""
+msgstr "Nieuwsbrief"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:31
 msgid "Newsletter subscriptions"
-msgstr ""
+msgstr "Inschrijven voor een nieuwsbrief"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:46
 msgid "Personal info"
-msgstr ""
+msgstr "Persoonlijke informatie"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:50
 msgid "Subscriptions"
-msgstr ""
+msgstr "Inschrijvingen"
 
 #: personal/newsletter/class_newsletterSubscriptions.inc:50
 msgid "Newsletter you are subscribed to"
-msgstr ""
+msgstr "Nieuwsbrieven waarvoor je bent ingeschreven"
 
 #: config/newsletter/class_newsletterConfig.inc:28
 msgid "Newsletter configuration"
-msgstr ""
+msgstr "Nieuwsbrief configuratie"
 
 #: config/newsletter/class_newsletterConfig.inc:29
 msgid "FusionDirectory newsletter plugin configuration"
-msgstr ""
+msgstr "FusionDirectory nieuwsbrief plugin configuratie"
 
 #: config/newsletter/class_newsletterConfig.inc:45
 msgid "Newsletter choices"
-msgstr ""
+msgstr "Keuzenlijst van nieuwsbrieven"
 
 #: config/newsletter/class_newsletterConfig.inc:45
 msgid "Newsletters the user can choose from"
-msgstr ""
+msgstr "Nieuwsbrieven waartussen gebruikers kunnen kiezen"
diff --git a/newsletter/locale/pl/fusiondirectory.po b/newsletter/locale/pl/fusiondirectory.po
index 72322d3361cca58b179c08c7765a6b0b2320f93c..081e3836410df58062d6bdca6ab31a3fba643076 100644
--- a/newsletter/locale/pl/fusiondirectory.po
+++ b/newsletter/locale/pl/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/pt/fusiondirectory.po b/newsletter/locale/pt/fusiondirectory.po
index 40105053b9ef3e5614658a7f8fb5cd2926ea04be..ab10a8b86b74dc4a612ca3a0bada2f76819f2cd8 100644
--- a/newsletter/locale/pt/fusiondirectory.po
+++ b/newsletter/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/pt_BR/fusiondirectory.po b/newsletter/locale/pt_BR/fusiondirectory.po
index 529cd9ba3bdb5a66bb69fa7e6f48901ad3c0db8c..663627c0de18d6d2a0cc6e8f8808dc8cf0ebfada 100644
--- a/newsletter/locale/pt_BR/fusiondirectory.po
+++ b/newsletter/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/ru/fusiondirectory.po b/newsletter/locale/ru/fusiondirectory.po
index e9e20248e5cc0693a7ab4bb47592b307115e6475..0217d57944c98ba16fa26897179df3ea79533b7b 100644
--- a/newsletter/locale/ru/fusiondirectory.po
+++ b/newsletter/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/ru@petr1708/fusiondirectory.po b/newsletter/locale/ru@petr1708/fusiondirectory.po
index 0d3c87458f4144eb072ec2254136e551da70fb1c..f1d9cfec0135559e2b701ae665ecb2f942fb2738 100644
--- a/newsletter/locale/ru@petr1708/fusiondirectory.po
+++ b/newsletter/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/sv/fusiondirectory.po b/newsletter/locale/sv/fusiondirectory.po
index 469ab91dca8c85d06156dc3bbea9e2fdbb3e80e8..913164d74ff9459eb630573643abdb9fa9e596bc 100644
--- a/newsletter/locale/sv/fusiondirectory.po
+++ b/newsletter/locale/sv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/ug/fusiondirectory.po b/newsletter/locale/ug/fusiondirectory.po
index 1d5cd3bdb983df7010a3639337e4c959439421d6..4699cc52d1450d6d48846316b6119704fc8e1e6d 100644
--- a/newsletter/locale/ug/fusiondirectory.po
+++ b/newsletter/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/vi_VN/fusiondirectory.po b/newsletter/locale/vi_VN/fusiondirectory.po
index 547122586b2361d99926f7c71ecba0f04580c0be..40efab46f97b6af07a3420f97aef47d1d8224408 100644
--- a/newsletter/locale/vi_VN/fusiondirectory.po
+++ b/newsletter/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/newsletter/locale/zh/fusiondirectory.po b/newsletter/locale/zh/fusiondirectory.po
index 3413c54bda3c9ab9fabef87e60d1e6b75bd0cc8f..d11f4cade83fc0a3d390d2802eab02029e6c1435 100644
--- a/newsletter/locale/zh/fusiondirectory.po
+++ b/newsletter/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/opsi/addons/opsi/class_opsiImport.inc b/opsi/addons/opsi/class_opsiImport.inc
index 34c8c75f5fae6c6876744c5699ad19a86d14c5e7..268279d320b782fb81c1c58e883a6946cc6be713 100644
--- a/opsi/addons/opsi/class_opsiImport.inc
+++ b/opsi/addons/opsi/class_opsiImport.inc
@@ -21,7 +21,7 @@
 
 class opsiImport extends systemImport
 {
-  protected $defaultType = 'winstation';
+  protected $defaultType = 'workstation';
 
   /* Return plugin information for acl handling  */
   static function plInfo()
@@ -53,6 +53,9 @@ class opsiImport extends systemImport
   protected function getExtraTabs($server_dn)
   {
     return array(
+      'sambaSystemTab' => array(
+        'is_account'      => TRUE,
+      ),
       'opsiClient' => array(
         'is_account'      => TRUE,
         'fdOpsiServerDn'  => $server_dn,
diff --git a/opsi/admin/opsi/class_opsiProductProperties.inc b/opsi/admin/opsi/class_opsiProductProperties.inc
index e4e01c0baa9c4533d52e125118f4c38a0530ae43..311dabbbf73779eb2b1791a50e18980cc48baf7b 100644
--- a/opsi/admin/opsi/class_opsiProductProperties.inc
+++ b/opsi/admin/opsi/class_opsiProductProperties.inc
@@ -88,10 +88,6 @@ class ProductPropertyAttribute extends CompositeAttribute
   }
 }
 
-/* TODO
- * Remove from select the properties already set ?
- */
-
 class opsiProductProperties extends simplePlugin
 {
   var $objectclasses = array('opsiProductProperties');
@@ -138,8 +134,10 @@ class opsiProductProperties extends simplePlugin
               ),
               '|', '', ''
             ),
+            // no order
             FALSE,
             array(),
+            // edit button
             TRUE
           )
         )
@@ -207,8 +205,12 @@ class opsiProductProperties extends simplePlugin
         array_map(
           function ($a)
           {
-            if ($a === TRUE) return "true";
-            if ($a === FALSE) return "false";
+            if ($a === TRUE) {
+              return 'true';
+            }
+            if ($a === FALSE) {
+              return 'false';
+            }
             return $a;
           },
           $property['defaultValues']
@@ -239,8 +241,12 @@ class opsiProductProperties extends simplePlugin
         array_map(
           function ($a)
           {
-            if ($a === TRUE) return "true";
-            if ($a === FALSE) return "false";
+            if ($a === TRUE) {
+              return 'true';
+            }
+            if ($a === FALSE) {
+              return 'false';
+            }
             return $a;
           },
           $property['possibleValues']
diff --git a/opsi/admin/systems/opsi/class_opsiClient.inc b/opsi/admin/systems/opsi/class_opsiClient.inc
index 18a091d84efbeb3b2db56bdbc0e03f7c28df6374..a57ea22c00fa21faa469921d6dc7450315ac30fb 100644
--- a/opsi/admin/systems/opsi/class_opsiClient.inc
+++ b/opsi/admin/systems/opsi/class_opsiClient.inc
@@ -33,7 +33,9 @@ class opsiClient extends simplePlugin
       'plShortName'   => _('OPSI client'),
       'plDescription' => _('Edit OPSI client settings'),
       'plSelfModify'  => FALSE,
-      'plObjectType'  => array('winstation', 'ogroup-dynamic'),
+      'plObjectType'  => array('workstation', 'ogroup-dynamic'),
+      'plDepends'     => array('sambaSystemTab'),
+      'plConflicts'   => array('debconfStartup','faiStartup'),
 
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
@@ -62,9 +64,12 @@ class opsiClient extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
     if ($object instanceof ogroup) {
-      $this->initialMembers = $object->saved_attributes['member'];
-      if (!is_array($this->initialMembers)) {
-        $this->initialMembers = array($this->initialMembers);
+      $this->initialMembers = array();
+      if (isset($object->saved_attributes['member'])) {
+        $this->initialMembers = $object->saved_attributes['member'];
+        if (!is_array($this->initialMembers)) {
+          $this->initialMembers = array($this->initialMembers);
+        }
       }
     }
   }
@@ -110,7 +115,10 @@ class opsiClient extends simplePlugin
       }
     }
 
-    parent::save();
+    $errors = parent::save();
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     if ($this->is_account) {
       $this->update_or_insert();
@@ -141,10 +149,10 @@ class opsiClient extends simplePlugin
         }
       }
     } else {
-      $macAddresses = array($this->parent->getBaseObject()->netConfigDNS->macAddress);
+      $macAddresses = array($this->parent->getBaseObject()->macAddress);
     }
     if (!empty($macAddresses) && $s_daemon->is_available()) {
-      $res = $s_daemon->append_call('OPSI.update_or_insert', $macAddresses, array());
+      $s_daemon->append_call('OPSI.update_or_insert', $macAddresses, array());
       if ($s_daemon->is_error()) {
         msg_dialog::display(
           _('Could not update OPSI information'),
@@ -156,6 +164,7 @@ class opsiClient extends simplePlugin
 
   function remove_from_parent()
   {
+    global $config;
     if ($this->member_of_group) {
       // 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
@@ -181,13 +190,13 @@ class opsiClient extends simplePlugin
         }
       }
     } elseif (!$this->member_of_group) {
-      $macAddresses = array($this->parent->getBaseObject()->netConfigDNS->macAddress);
+      $macAddresses = array($this->parent->getBaseObject()->macAddress);
     }
 
     if (!empty($macAddresses)) {
       $s_daemon   = new supportDaemon();
       if ($s_daemon->is_available()) {
-        $res = $s_daemon->append_call('OPSI.delete', $macAddresses, array());
+        $s_daemon->append_call('OPSI.delete', $macAddresses, array());
         if ($s_daemon->is_error()) {
           msg_dialog::display(
             _('Could not remove OPSI information'),
@@ -197,7 +206,7 @@ class opsiClient extends simplePlugin
       }
     }
 
-    parent::remove_from_parent();
+    return parent::remove_from_parent();
   }
 
   public function server_changed ()
diff --git a/opsi/admin/systems/services/opsi/class_serviceOPSI.inc b/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
index 0b7b8f5e7ccc65587b37313ea34ac928205cc934..def1f420b037bb6d9a8eb5be1e62c3b2d501aa6a 100644
--- a/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
+++ b/opsi/admin/systems/services/opsi/class_serviceOPSI.inc
@@ -61,16 +61,19 @@ class serviceOPSI extends simpleService
   {
     parent::__construct($dn, $parent);
     if ($parent !== NULL) {
-      if (isset($parent->parent->netConfigDNS)) {
-        $ip = $parent->parent->netConfigDNS->ipHostNumber;
+      if (isset($parent->parent->ipHostNumber)) {
+        $ip = $parent->parent->ipHostNumber;
       } elseif (isset($parent->parent)) {
-        $ip = $parent->parent->getBaseObject()->netConfigDNS->ipHostNumber;
+        $ip = $parent->parent->getBaseObject()->ipHostNumber;
       } else {
-        trigger_error("Can't find IP for OPSI service");
-        $ip = "";
+        trigger_error('Can\'t find IP for OPSI service');
+        $ip = '';
+      }
+      if (is_array($ip)) {
+        $ip = reset($ip);
       }
       $this->attributesAccess['fdOpsiServerURI']->setDefaultValue('https://'.$ip.':4447/rpc');
-      if ($this->fdOpsiServerURI == "") {
+      if ($this->fdOpsiServerURI == '') {
         $this->attributesAccess['fdOpsiServerURI']->resetToDefault();
       }
     }
diff --git a/opsi/locale/ar/fusiondirectory.po b/opsi/locale/ar/fusiondirectory.po
index d265e375dcab38b4b46003ca9a652c55d86954d6..280a92d0732a716ea0c56fba2d6782705548e09f 100644
--- a/opsi/locale/ar/fusiondirectory.po
+++ b/opsi/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/ca/fusiondirectory.po b/opsi/locale/ca/fusiondirectory.po
index 9567d6e0df1703a8d3972b47f4c3fd7c326feab2..e8526abe1830792a746d5a457870c66fe1828737 100644
--- a/opsi/locale/ca/fusiondirectory.po
+++ b/opsi/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nom"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/cs_CZ/fusiondirectory.po b/opsi/locale/cs_CZ/fusiondirectory.po
index 23cbd5f8e0e1a9b071802c3279ee5d7df52b6206..c499c7b6f6592f56b41677811a88dd793b504f84 100644
--- a/opsi/locale/cs_CZ/fusiondirectory.po
+++ b/opsi/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr "Importovat OPSI"
 msgid "Import windows stations from OPSI into FD"
 msgstr "Importovat poÄÃtaÄe s MS Windows z OPSI do F.D."
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr "Server s Argonaut nenÃ dostupnÃ½"
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
 msgstr "Å½Ã¡dnÃ¡ MAC adresa"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -59,7 +60,7 @@ msgstr "RelativnÃ rozliÅ¡enÃ½ nÃ¡zev OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
-msgstr "VÄ›tev ve kterÃ© budou uklÃ¡dÃ¡ny OPSI profily"
+msgstr "VÄ›tev, ve kterÃ© budou uchovÃ¡vÃ¡ny OPSI profily"
 
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
@@ -90,9 +91,9 @@ msgstr "OPSI server pomocÃ kterÃ©ho nasadit"
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
@@ -120,7 +121,9 @@ msgstr "Produkty pro spuÅ¡tÄ›nÃ z vestavÄ›nÃ©ho datovÃ©ho ÃºloÅ¾iÅ¡tÄ› stroje"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 msgid "The localboot products to put in this list"
-msgstr "Produkty pro zavedenÃ z vestavÄ›nÃ©ho ÃºloÅ¾iÅ¡tÄ› stroje, kterÃ© umÃstit na tento seznam"
+msgstr ""
+"Produkty pro zavedenÃ z vestavÄ›nÃ©ho ÃºloÅ¾iÅ¡tÄ› stroje, kterÃ© umÃstit na tento "
+"seznam"
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
@@ -133,11 +136,12 @@ msgstr "OPSI seznam programovÃ©ho vybavenÃ"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
-msgstr "Produkty pro mÃstnÃ zavedenÃ pro instalaci prostÅ™ednictvÃm tohoto seznamu"
+msgstr ""
+"Produkty pro mÃstnÃ zavedenÃ pro instalaci prostÅ™ednictvÃm tohoto seznamu"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "NedaÅ™Ã se kontaktovat argonaut server"
 
@@ -155,7 +159,7 @@ msgstr "%s nelze v LDAP nalÃ©zt"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "NezdaÅ™ilo se kontaktovat OPSI server"
 
@@ -182,7 +186,8 @@ msgstr "Seznamy programovÃ©ho vybavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:107
 msgid "Software lists that will be installed with this profile"
-msgstr "Seznam programovÃ©ho vybavenÃ, kterÃ½ bude nainstalovÃ¡n touto sadou nastavenÃ"
+msgstr ""
+"Seznam programovÃ©ho vybavenÃ, kterÃ½ bude nainstalovÃ¡n touto sadou nastavenÃ"
 
 #: admin/opsi/class_opsiProfile.inc:202
 #, php-format
@@ -193,12 +198,12 @@ msgstr "%s (%s)"
 msgid "OPSI profile management"
 msgstr "SprÃ¡va sady nastavenÃ OPSI"
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr "Vlastnosti produktu"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr "Vlastnosti produktÅ¯ v tÃ©to sadÄ› nastavenÃ"
 
@@ -210,32 +215,32 @@ msgstr "Klient OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Upravit nastavenÃ OPSI klienta"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "Klient OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "OPSI server"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "OPSI server, ke kterÃ©mu je tento klient pÅ™ipojen"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr "Profil OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr "Sada nastavenÃ OPSI, kterÃ¡ mÃ¡ bÃ½t pouÅ¾ita na tomto klientovi"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr "Nelze zjistit macAddress pro OPSI server !"
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
@@ -246,7 +251,7 @@ msgstr "SluÅ¾ba OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
 msgid "OPSI Server information"
@@ -254,7 +259,7 @@ msgstr ""
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "Server URI"
-msgstr "URI adresa serveru"
+msgstr "URI serveru"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "The URI to use for connection"
@@ -262,7 +267,7 @@ msgstr "URI adresa, kterou pouÅ¾Ãt pro pÅ™ipojenÃ"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "User"
-msgstr "UÅ¾ivatel"
+msgstr "uÅ¾ivatel"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "The user to use for connection"
@@ -270,7 +275,7 @@ msgstr "UÅ¾ivatelskÃ½ ÃºÄet, pouÅ¾itÃ½ pro pÅ™ipojenÃ"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "The password to use for connection"
@@ -281,4 +286,7 @@ 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 "VarovÃ¡nÃ : Jakmile importujete svÃ© OPSI stroje do FusionDirectory, budou zde spravovÃ¡ny. TakÅ¾e, kdyÅ¾ je smaÅ¾ete Äi vypnete jejich OPSI panel, budou z OPSI odstranÄ›ny."
+msgstr ""
+"VarovÃ¡nÃ : Jakmile importujete svÃ© OPSI stroje do FusionDirectory, budou zde"
+" spravovÃ¡ny. TakÅ¾e, kdyÅ¾ je smaÅ¾ete Äi vypnete jejich OPSI panel, budou z "
+"OPSI odstranÄ›ny."
diff --git a/opsi/locale/de/fusiondirectory.po b/opsi/locale/de/fusiondirectory.po
index 9925860e9519c8f80372e2588d25ce34b4e33f91..72ecff69354e9b4c5f9ae7eb68fb1c5fa3e9ceae 100644
--- a/opsi/locale/de/fusiondirectory.po
+++ b/opsi/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# d.oertel <d.oertel@uib.de>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,18 +26,18 @@ msgstr "OPSI-Import"
 msgid "Import windows stations from OPSI into FD"
 msgstr "Windows-Stationen von OPSI in FD importieren"
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr "Argonaut-Server ist nicht verfÃ¼gbar"
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
 msgstr "Keine MAC-Adresse"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgstr "Der zu verwendende OPSI-Server"
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Name"
 
@@ -134,13 +134,14 @@ msgstr "OPSI-Softwareliste"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
-msgstr "Die Localboot Produkte, welche mit dieser Liste installiert werden sollen"
+msgstr ""
+"Die Localboot Produkte, welche mit dieser Liste installiert werden sollen"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
-msgstr "Keine Verbindung zum Argonaut-Server"
+msgstr "Keine Verbindung zum-Argonaut Server"
 
 #: admin/opsi/class_opsiSoftwareList.inc:123
 #: admin/opsi/class_opsiProfile.inc:168
@@ -156,7 +157,7 @@ msgstr "Konnte %s nicht im LDAP finden"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -194,12 +195,12 @@ msgstr "%s (%s)"
 msgid "OPSI profile management"
 msgstr "OPSI-Profilverwaltung"
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr "Produkteigenschaften"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr "Eigenschaften der Produkte von diesem Profil"
 
@@ -211,32 +212,32 @@ msgstr "OPSI-Client"
 msgid "Edit OPSI client settings"
 msgstr "OPSI-Clienteinstellungen bearbeiten"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "OPSI-Client"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "OPSI-Server"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "Der OPSI-Server zu dem dieser Client verbunden ist"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr "OPSI-Profil"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr "Das OPSI-Profil, welches auf diesen Client angewendet wird"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr "Konnte die MAC-Adresse des OPSI-Servers nicht finden !"
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
@@ -282,4 +283,7 @@ 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 "Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI lÃ¶schen, so wird er dadurch nicht wirklich gelÃ¶scht."
+msgstr ""
+"Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, "
+"werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI lÃ¶schen, "
+"so wird er dadurch nicht wirklich gelÃ¶scht."
diff --git a/opsi/locale/el_GR/fusiondirectory.po b/opsi/locale/el_GR/fusiondirectory.po
index 775933577ab980e548bf4828da41ccd648a26302..51c5eaef1a08db81e59fa6e0c2510f98f27ea165 100644
--- a/opsi/locale/el_GR/fusiondirectory.po
+++ b/opsi/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Thanasis <akoutsonikolas@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,18 +26,18 @@ msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® OPSI"
 msgid "Import windows stations from OPSI into FD"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î® ÏƒÏ„Î±Î¸Î¼ÏŽÎ½ Windows Î±Ï€ÏŒ Ï„Î¿ OPSI ÏƒÏ„Î¿ FD"
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Î¿ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Argonaut"
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· MAC"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -92,7 +91,7 @@ msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ OPSI Ï€Î¿Ï… Î¸Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
@@ -139,7 +138,7 @@ msgstr "Î¤Î± Ï€ÏÎ¿ÏŠÏŒÎ½Ï„Î± Ï„Î¿Ï€Î¹ÎºÎ®Ï‚ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Ï€Î¿Ï… Î¸Î± ÎµÎ³
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Î”ÎµÎ½ Î®Ï„Î±Î½ Î´Ï…Î½Î±Ï„Î® Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î¼Îµ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® argonaut"
 
@@ -157,7 +156,7 @@ msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Î¿ %s ÏƒÏ„Î¿Î½ LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÏƒÏ„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® OPSI"
 
@@ -195,12 +194,12 @@ msgstr "%s (%s)"
 msgid "OPSI profile management"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Ï„Î¿Ï… OPSI Ï€ÏÎ¿Ï†Î¯Î»"
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr "Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚ Ï€ÏÎ¿ÏŠÏŒÎ½Ï„Ï‰Î½"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr "ÎŸÎ¹ Î¹Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚ Ï„Ï‰Î½ Ï€ÏÎ¿ÏŠÏŒÎ½Ï„Ï‰Î½ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î»"
 
@@ -212,32 +211,32 @@ msgstr "Î ÎµÎ»Î¬Ï„Î·Ï‚ OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï„Î¿Ï… Ï€ÎµÎ»Î¬Ï„Î· OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "Î ÎµÎ»Î¬Ï„Î·Ï‚ OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ OPSI Ï€Î¿Ï… ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒÏ‚ Î¿ Ï€ÎµÎ»Î¬Ï„Î·Ï‚"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr "Î ÏÎ¿Ï†Î¯Î» OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr "Î¤Î¿ Ï€ÏÎ¿Ï†Î¯Î» OPSI Ï€Î¿Ï… Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï€ÎµÎ»Î¬Ï„Î·"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î»Î®ÏˆÎ· Ï„Î·Ï‚ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ MAC Î³Î¹Î± Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
@@ -283,4 +282,7 @@ 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 "Î ÏÎ¿ÏƒÎ¿Ï‡Î®: ÎœÎµÏ„Î¬ Ï„Î·Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½ OPSI ÏƒÏ„Î¿ FusionDirectory, Î±Ï…Ï„Î¿Î¯ Î¸Î± ÎµÎ»ÎÎ³Ï‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ (FD). Î£Ï…Î½ÎµÏ€ÏŽÏ‚, Î±Î½ Ï„Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î® Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ OPSI ÎºÎ±ÏÏ„ÎÎ»Î± Ï„Î¿Ï…Ï‚, Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½ Î±Ï€ÏŒ Ï„Î¿ OPSI"
+msgstr ""
+"Î ÏÎ¿ÏƒÎ¿Ï‡Î®: ÎœÎµÏ„Î¬ Ï„Î·Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½ OPSI ÏƒÏ„Î¿ FusionDirectory, Î±Ï…Ï„Î¿Î¯ "
+"Î¸Î± ÎµÎ»ÎÎ³Ï‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ (FD). Î£Ï…Î½ÎµÏ€ÏŽÏ‚, Î±Î½ Ï„Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î® Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ "
+"Ï„Î·Î½ OPSI ÎºÎ±ÏÏ„ÎÎ»Î± Ï„Î¿Ï…Ï‚, Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½ Î±Ï€ÏŒ Ï„Î¿ OPSI"
diff --git a/opsi/locale/en/fusiondirectory.po b/opsi/locale/en/fusiondirectory.po
index 8526d4a39fc05d37fa36f7a99bd8d68b5210093d..047cd4f07b647fc5b47ec47dc56c8c15736a7c4b 100644
--- a/opsi/locale/en/fusiondirectory.po
+++ b/opsi/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -36,7 +36,7 @@ msgid "No mac address"
 msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +210,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/es/fusiondirectory.po b/opsi/locale/es/fusiondirectory.po
index e05def8a6b8392f0e15f67fbb241f0bdf1fe4e32..b5c0ed4cc54c367c2628d95f227b71ac5e55cabd 100644
--- a/opsi/locale/es/fusiondirectory.po
+++ b/opsi/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/es_CO/fusiondirectory.po b/opsi/locale/es_CO/fusiondirectory.po
index 89c032d717ca0d00ecfc8e0adfd367c4247e6df6..58044755ab9df9b243bb8491e7eb0514fdd1c3e2 100644
--- a/opsi/locale/es_CO/fusiondirectory.po
+++ b/opsi/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/es_VE/fusiondirectory.po b/opsi/locale/es_VE/fusiondirectory.po
index d4d7da832079bfc48d174e357a73fac4b0c89c03..5c8b3481c3b7be36027614483a10d6f9543f55ee 100644
--- a/opsi/locale/es_VE/fusiondirectory.po
+++ b/opsi/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nombre"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/fa_IR/fusiondirectory.po b/opsi/locale/fa_IR/fusiondirectory.po
index 708d022d717d17b636f26af33e0a993a75fd50d5..02d3e6c9fcc3b84ec36dfcfeda693d8f1a172fef 100644
--- a/opsi/locale/fa_IR/fusiondirectory.po
+++ b/opsi/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +25,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +210,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/fi_FI/fusiondirectory.po b/opsi/locale/fi_FI/fusiondirectory.po
index 4293151b55c19c2b2a680470daaae8ef56c90456..9b65289f57a70c5974bacebefd37569a916cc58e 100644
--- a/opsi/locale/fi_FI/fusiondirectory.po
+++ b/opsi/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nimi"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/fr/fusiondirectory.po b/opsi/locale/fr/fusiondirectory.po
index 37f4c91a3d315085193a49b51b1def71fb46173e..eb9f58cc573b8ee08b0dea3167205a23634d634d 100644
--- a/opsi/locale/fr/fusiondirectory.po
+++ b/opsi/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,26 +24,26 @@ msgstr "Importation OPSI"
 
 #: addons/opsi/class_opsiImport.inc:31
 msgid "Import windows stations from OPSI into FD"
-msgstr "Importer les stations Windows de OPSI dans FD"
+msgstr "Importer stations Windows de OPSI dans FD"
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr "Serveur Argonaut indisponible"
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
 msgstr "Pas d'adresse mac"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr "Mise Ã  jour des informations OPSI impossible"
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
-msgstr "Configuration OPSI"
+msgstr "Informations sur le serveur OPSI"
 
 #: config/opsi/class_opsiConfig.inc:29
 msgid "FusionDirectory OPSI plugin configuration"
@@ -57,11 +56,11 @@ msgstr "OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
-msgstr "Branche OPSI"
+msgstr "RDN OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les profils OPSI"
+msgstr "Branche oÃ¹ seront stockÃ©s les profiles OPSI"
 
 #: admin/opsi/class_opsiOnDemandList.inc:28
 #: admin/opsi/class_opsiOnDemandList.inc:33
@@ -87,12 +86,12 @@ msgstr "Serveur OPSI"
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:89
 msgid "OPSI server to use for deployment"
-msgstr "Serveur OPSI Ã  utiliser pour le dÃ©ploiement"
+msgstr "Serveur OPSI a utiliser pour le dÃ©ploiement"
 
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nom"
 
@@ -104,11 +103,11 @@ msgstr "Nom du profil OPSI"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show details"
-msgstr "Afficher les dÃ©tails"
+msgstr "Montrer les dÃ©tails"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show further information to the user"
-msgstr "Afficher plus d'informations Ã  lâ€™utilisateur"
+msgstr "Montrer plus d'informations Ã  ,l'utilisateur"
 
 #: admin/opsi/class_opsiOnDemandList.inc:64
 #: admin/opsi/class_opsiSoftwareList.inc:64
@@ -118,7 +117,7 @@ msgstr "Logiciels"
 #: admin/opsi/class_opsiOnDemandList.inc:68
 #: admin/opsi/class_opsiSoftwareList.inc:81
 msgid "Localboot products"
-msgstr "Produits localboot"
+msgstr "Produit localboot OPSI"
 
 #: admin/opsi/class_opsiOnDemandList.inc:68
 msgid "The localboot products to put in this list"
@@ -131,7 +130,7 @@ msgstr "Liste OPSI"
 #: admin/opsi/class_opsiSoftwareList.inc:33
 #: admin/opsi/class_opsiSoftwareList.inc:37
 msgid "OPSI software list"
-msgstr "Liste de logiciels OPSI"
+msgstr "Liste des logiciels OPSI"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
@@ -139,7 +138,7 @@ msgstr "Les produits localboot Ã  installer avec cette liste"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Impossible de contacter le serveur Argonaut"
 
@@ -147,7 +146,7 @@ msgstr "Impossible de contacter le serveur Argonaut"
 #: admin/opsi/class_opsiProfile.inc:168
 #, php-format
 msgid "Server %s has no mac address configured in the LDAP"
-msgstr "Le serveur %s n'a pas d'adresse mac configurÃ©e dans le LDAP"
+msgstr "Le serveur %s n'a pas d'adresse mac configure dans le LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:129
 #: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
@@ -157,7 +156,7 @@ msgstr "Impossible de trouver %s dans l'annuaire LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Impossible de contacter le serveur OPSI"
 
@@ -172,7 +171,7 @@ msgstr "EntrÃ©es"
 
 #: admin/opsi/class_opsiProfile.inc:102
 msgid "Netboot product"
-msgstr "Produit netboot"
+msgstr "Produit netboot OPSI"
 
 #: admin/opsi/class_opsiProfile.inc:102
 msgid "The netboot product to use for this profile"
@@ -180,7 +179,7 @@ msgstr "Le produit netboot Ã  utiliser pour ce profil"
 
 #: admin/opsi/class_opsiProfile.inc:107
 msgid "Software lists"
-msgstr "Listes de logiciels"
+msgstr "Liste des logiciels OPSI"
 
 #: admin/opsi/class_opsiProfile.inc:107
 msgid "Software lists that will be installed with this profile"
@@ -195,12 +194,12 @@ msgstr "%s (%s)"
 msgid "OPSI profile management"
 msgstr "Gestion des profils OPSI"
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr "PropriÃ©tÃ©s du produit"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr "PropriÃ©tÃ©s des produits de ce profil"
 
@@ -210,34 +209,34 @@ msgstr "Client OPSI"
 
 #: admin/systems/opsi/class_opsiClient.inc:34
 msgid "Edit OPSI client settings"
-msgstr " Ã‰dition des paramÃ¨tres du client OPSI"
+msgstr " Ã‰dition des paramÃ¨tres OPSI du client"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "Client OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "Serveur OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "Serveur OPSI sur lequel le client est connectÃ©"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr "Profil OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr "Le profil OPSI Ã  appliquer Ã  ce client"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
-msgstr "Impossible d'obtenir l'adresse mac pour le serveur OPSIâ€¯!"
+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
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr "Effacement des informations OPSI impossible"
 
@@ -248,7 +247,7 @@ msgstr "Service OPSI"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:30
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:41
 msgid "OPSI Server information"
@@ -260,7 +259,7 @@ msgstr "URI du serveur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:44
 msgid "The URI to use for connection"
-msgstr "URI utilisÃ©e pour la connexion"
+msgstr "URI utilisÃ© pour la connexion au serveur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "User"
@@ -268,7 +267,7 @@ msgstr "Utilisateur"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:48
 msgid "The user to use for connection"
-msgstr "Nom du compte Ã  utiliser pour la connexion"
+msgstr "Nom du compte utilisÃ© pour la connexion"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "Password"
@@ -276,11 +275,14 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/opsi/class_serviceOPSI.inc:52
 msgid "The password to use for connection"
-msgstr "Mot de passe Ã  utiliser pour la connexion"
+msgstr "Mot de passe utilisÃ© pour la connexion"
 
 #: addons/opsi/opsiimport.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 "Attention: Une fois que vous importez vos hÃ´tes OPSI dans FusionDirectory, elles seront gÃ©rÃ©es par lui, donc si vous les supprimez ou dÃ©sactivez leur onglet OPSI, elle seront retirÃ©es de OPSI."
+msgstr ""
+"Attention: Une fois que vous importez vos hÃ´tes OPSI dans FusionDirectory, "
+"ils seront gÃ©rÃ©s par lui, donc si vous les supprimez ou dÃ©sactivez leur "
+"onglet OPSI, ils seront retirÃ©s de OPSI."
diff --git a/opsi/locale/hu_HU/fusiondirectory.po b/opsi/locale/hu_HU/fusiondirectory.po
index 11eab341c6e4c328e9702275253c58757ccedfee..4124867bc12ca67cde4efb41920fad3241c8b504 100644
--- a/opsi/locale/hu_HU/fusiondirectory.po
+++ b/opsi/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "NÃ©v"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/id/fusiondirectory.po b/opsi/locale/id/fusiondirectory.po
index bab36416c1a56c1d447c8463e6f4d852b0627123..e9fcb14f8b55b69b5b65b4c1997dfad1705b5937 100644
--- a/opsi/locale/id/fusiondirectory.po
+++ b/opsi/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +25,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +210,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/it_IT/fusiondirectory.po b/opsi/locale/it_IT/fusiondirectory.po
index a4df3fcf0b3051bcb858372b4f089deb0d5565d3..62bbac0fe7c2b4288ee99d25590d2b8f4d78a390 100644
--- a/opsi/locale/it_IT/fusiondirectory.po
+++ b/opsi/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:21+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,18 +26,18 @@ msgstr "Importazione da OPSI"
 msgid "Import windows stations from OPSI into FD"
 msgstr "Importare stazioni Windows da OPSI a FD"
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr "Il server Argonaut non Ã¨ disponibile"
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
 msgstr "Alcun indirizzo MAC"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr "Impossibile aggiornare le informazioni di OPSI"
 
@@ -93,7 +91,7 @@ msgstr "Server OPSI da usare per la distribuzione"
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
@@ -140,7 +138,7 @@ msgstr "I prodotti localboot da installare con questo elenco"
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr "Non posso contattare il server Argonaut"
 
@@ -158,7 +156,7 @@ msgstr "Impossibile trovare %s nell'annuario LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr "Campo per contattare il server OPSI"
 
@@ -196,12 +194,12 @@ msgstr "%s (%s)"
 msgid "OPSI profile management"
 msgstr "Gestione profilo OPSI"
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr "ProprietÃ  del prodotto"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr "ProprietÃ  dei prodotti di questo profilo"
 
@@ -213,32 +211,32 @@ msgstr "Cliente OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Modifica le impostazioni del cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "Cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "Server OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "Il server OPSI al quale questo cliente Ã¨ connesso"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr "Profilo OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr "Il profilo OPSI da applicare a questo cliente"
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr "Impossibile ottenere indirizzo MAC per il server OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr "Impossibile rimuovere informazioni su OPSI"
 
@@ -284,4 +282,7 @@ 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 "Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi verranno gestiti da questo, percio' se cancellate o disattivate la scheda OPSI, essi verranno rimossi da OPSI"
+msgstr ""
+"Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi "
+"verranno gestiti da questo, percio' se cancellate o disattivate la scheda "
+"OPSI, essi verranno rimossi da OPSI"
diff --git a/opsi/locale/lv/fusiondirectory.po b/opsi/locale/lv/fusiondirectory.po
index b96ad72a76f627f50279aee8622ab8c900a00e1b..195d568406cd72dc9062a39f818a7a316fd7b01d 100644
--- a/opsi/locale/lv/fusiondirectory.po
+++ b/opsi/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "VÄrds "
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/nb/fusiondirectory.po b/opsi/locale/nb/fusiondirectory.po
index 489a6d0b678980037fd5e8ea50b34a55f0bb7dcc..2394c72205aa966ba1b7e9de6fb7347bb004c8fb 100644
--- a/opsi/locale/nb/fusiondirectory.po
+++ b/opsi/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Navn"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/nl/fusiondirectory.po b/opsi/locale/nl/fusiondirectory.po
index d16f3decf2833dab457ffc11cd66ae8d06db357f..7f52bfc178138c5e44d187ecfbee622a59605239 100644
--- a/opsi/locale/nl/fusiondirectory.po
+++ b/opsi/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,30 +20,30 @@ msgstr ""
 
 #: addons/opsi/class_opsiImport.inc:30 addons/opsi/class_opsiImport.inc:36
 msgid "OPSI import"
-msgstr ""
+msgstr "OPSI importeren"
 
 #: addons/opsi/class_opsiImport.inc:31
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: admin/opsi/class_opsiSoftwareList.inc:122
 #: admin/opsi/class_opsiProfile.inc:167
 msgid "No mac address"
-msgstr ""
+msgstr "Geen MAC-adres"
 
-#: addons/opsi/class_opsiImport.inc:95
-#: admin/systems/opsi/class_opsiClient.inc:150
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
-msgstr ""
+msgstr "Kan de OPSI informatie niet updaten"
 
 #: config/opsi/class_opsiConfig.inc:28
 msgid "OPSI configuration"
-msgstr ""
+msgstr "OPSI configuratie"
 
 #: config/opsi/class_opsiConfig.inc:29
 msgid "FusionDirectory OPSI plugin configuration"
@@ -51,11 +52,11 @@ msgstr ""
 #: config/opsi/class_opsiConfig.inc:42
 #: admin/opsi/class_opsiProfileManagement.inc:33
 msgid "OPSI"
-msgstr ""
+msgstr "OPSI"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "OPSI RDN"
-msgstr ""
+msgstr "OPSI RDN"
 
 #: config/opsi/class_opsiConfig.inc:45
 msgid "Branch in which OPSI profiles will be stored"
@@ -79,7 +80,7 @@ msgstr ""
 #: admin/opsi/class_opsiSoftwareList.inc:54
 #: admin/opsi/class_opsiProfile.inc:89
 msgid "OPSI server"
-msgstr ""
+msgstr "OPSI server"
 
 #: admin/opsi/class_opsiOnDemandList.inc:50
 #: admin/opsi/class_opsiSoftwareList.inc:54
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Naam"
 
@@ -102,7 +103,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show details"
-msgstr ""
+msgstr "Toon de details"
 
 #: admin/opsi/class_opsiOnDemandList.inc:58
 msgid "Show further information to the user"
@@ -124,12 +125,12 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:32
 msgid "OPSI list"
-msgstr ""
+msgstr "OPSI lijst"
 
 #: admin/opsi/class_opsiSoftwareList.inc:33
 #: admin/opsi/class_opsiSoftwareList.inc:37
 msgid "OPSI software list"
-msgstr ""
+msgstr "OPSI software lijst"
 
 #: admin/opsi/class_opsiSoftwareList.inc:68
 msgid "The localboot products to install with this list"
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -151,18 +152,18 @@ msgstr ""
 #: admin/opsi/class_opsiProfile.inc:139 admin/opsi/class_opsiProfile.inc:174
 #, php-format
 msgid "Could not find %s in the LDAP"
-msgstr ""
+msgstr "Kan %s niet vinden in de LDAP"
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
-msgstr ""
+msgstr "Kan de OPSI server niet bereiken"
 
 #: admin/opsi/class_opsiProfile.inc:67 admin/opsi/class_opsiProfile.inc:68
 #: admin/opsi/class_opsiProfile.inc:72
 msgid "OPSI profile"
-msgstr ""
+msgstr "OPSI profiel"
 
 #: admin/opsi/class_opsiProfile.inc:99
 msgid "Entries"
@@ -178,7 +179,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiProfile.inc:107
 msgid "Software lists"
-msgstr ""
+msgstr "Software lijsten"
 
 #: admin/opsi/class_opsiProfile.inc:107
 msgid "Software lists that will be installed with this profile"
@@ -187,55 +188,55 @@ msgstr ""
 #: admin/opsi/class_opsiProfile.inc:202
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: admin/opsi/class_opsiProfileManagement.inc:34
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
-msgstr ""
+msgstr "Product eigenschappen"
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
 #: admin/systems/opsi/class_opsiClient.inc:33
 msgid "OPSI client"
-msgstr ""
+msgstr "OPSI client"
 
 #: admin/systems/opsi/class_opsiClient.inc:34
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
-msgstr ""
+msgstr "OPSI client"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
-msgstr ""
+msgstr "OPSI server"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
-msgstr ""
+msgstr "OPSI profiel"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/pl/fusiondirectory.po b/opsi/locale/pl/fusiondirectory.po
index f1163567aa53130858d376cb13908214f3c167c8..c9afc1de074558475dd5b0f4935be931535c6fbd 100644
--- a/opsi/locale/pl/fusiondirectory.po
+++ b/opsi/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "ImiÄ™"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/pt/fusiondirectory.po b/opsi/locale/pt/fusiondirectory.po
index 58b40270d37b5594f5dbbda0aaabfd34faa6a1c7..9647bacba78121ac0bb68970741f202605579798 100644
--- a/opsi/locale/pt/fusiondirectory.po
+++ b/opsi/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/pt_BR/fusiondirectory.po b/opsi/locale/pt_BR/fusiondirectory.po
index 6ea55df1ad7ff526afba55db469f64bc2a2b02ef..20103297ef17c8e07ba1278694497f7be537cb07 100644
--- a/opsi/locale/pt_BR/fusiondirectory.po
+++ b/opsi/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Nome"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr "%s(%s)"
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr "Cliente OPSI"
 msgid "Edit OPSI client settings"
 msgstr "Editar configuraÃ§Ãµes de cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr "Cliente OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr "Servidor OPSI"
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr "O Servidor OPSI que este cliente estÃ¡ conectado"
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/ru/fusiondirectory.po b/opsi/locale/ru/fusiondirectory.po
index 3e6a8c4a0c126c16785e10861b80f352908b79db..d5fa1e3d4d8879b51d24738811838d482d5d8c33 100644
--- a/opsi/locale/ru/fusiondirectory.po
+++ b/opsi/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -187,18 +188,18 @@ msgstr ""
 #: admin/opsi/class_opsiProfile.inc:202
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: admin/opsi/class_opsiProfileManagement.inc:34
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/ru@petr1708/fusiondirectory.po b/opsi/locale/ru@petr1708/fusiondirectory.po
index 760809515c2cff0069279c51d5cb812f13190ccb..b738d59b587868eb80aa13003d6def2f55a5aaac 100644
--- a/opsi/locale/ru@petr1708/fusiondirectory.po
+++ b/opsi/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +25,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +210,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/sv/fusiondirectory.po b/opsi/locale/sv/fusiondirectory.po
index 3d3c5af1cff019b166feeb5ada6b030089090d84..5df491e1b5a19927e2c84c4cee9c411db15ee7c1 100644
--- a/opsi/locale/sv/fusiondirectory.po
+++ b/opsi/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "Namn"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/ug/fusiondirectory.po b/opsi/locale/ug/fusiondirectory.po
index 2e2f835259fa2c704ce04905af479915a7ba4e8d..c58f45a88f7111e3718cce9491bf9242f88964ef 100644
--- a/opsi/locale/ug/fusiondirectory.po
+++ b/opsi/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +25,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +193,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +210,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/vi_VN/fusiondirectory.po b/opsi/locale/vi_VN/fusiondirectory.po
index a8648f1aca2d009bfa489e6a8ed804b7fba00535..a4931ceec17041a09ffe0cc44c5579daa2bfb644 100644
--- a/opsi/locale/vi_VN/fusiondirectory.po
+++ b/opsi/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "TÃªn"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/opsi/locale/zh/fusiondirectory.po b/opsi/locale/zh/fusiondirectory.po
index 49f01a49c03f70aed2279aec8fcee85c3f264f36..42ae50fc48938dc87b0dcbe732d45999294bfa96 100644
--- a/opsi/locale/zh/fusiondirectory.po
+++ b/opsi/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,18 @@ msgstr ""
 msgid "Import windows stations from OPSI into FD"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:69
+#: addons/opsi/class_opsiImport.inc:72
 msgid "Argonaut server is not available"
 msgstr ""
 
-#: addons/opsi/class_opsiImport.inc:80
+#: addons/opsi/class_opsiImport.inc:83
 #: 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
+#: addons/opsi/class_opsiImport.inc:98
+#: admin/systems/opsi/class_opsiClient.inc:155
 msgid "Could not update OPSI information"
 msgstr ""
 
@@ -90,7 +91,7 @@ msgstr ""
 #: admin/opsi/class_opsiOnDemandList.inc:54
 #: admin/opsi/class_opsiSoftwareList.inc:58
 #: admin/opsi/class_opsiProfile.inc:86 admin/opsi/class_opsiProfile.inc:93
-#: admin/opsi/class_opsiProductProperties.inc:117
+#: admin/opsi/class_opsiProductProperties.inc:113
 msgid "Name"
 msgstr "åç§°"
 
@@ -137,7 +138,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:110
 #: admin/opsi/class_opsiProfile.inc:155
-#: admin/opsi/class_opsiProductProperties.inc:176
+#: admin/opsi/class_opsiProductProperties.inc:174
 msgid "Could not contact argonaut server"
 msgstr ""
 
@@ -155,7 +156,7 @@ msgstr ""
 
 #: admin/opsi/class_opsiSoftwareList.inc:137
 #: admin/opsi/class_opsiProfile.inc:182
-#: admin/opsi/class_opsiProductProperties.inc:192
+#: admin/opsi/class_opsiProductProperties.inc:190
 msgid "Failed to contact OPSI server"
 msgstr ""
 
@@ -193,12 +194,12 @@ msgstr ""
 msgid "OPSI profile management"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:104
-#: admin/opsi/class_opsiProductProperties.inc:105
+#: admin/opsi/class_opsiProductProperties.inc:100
+#: admin/opsi/class_opsiProductProperties.inc:101
 msgid "Product properties"
 msgstr ""
 
-#: admin/opsi/class_opsiProductProperties.inc:122
+#: admin/opsi/class_opsiProductProperties.inc:118
 msgid "Properties of the products of this profile"
 msgstr ""
 
@@ -210,32 +211,32 @@ msgstr ""
 msgid "Edit OPSI client settings"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:46
+#: admin/systems/opsi/class_opsiClient.inc:48
 msgid "OPSI Client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "OPSI Server"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:49
+#: admin/systems/opsi/class_opsiClient.inc:51
 msgid "The OPSI Server this client is connected to"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "OPSI Profile"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:53
+#: admin/systems/opsi/class_opsiClient.inc:55
 msgid "The OPSI Profile to apply to this client"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:96
+#: admin/systems/opsi/class_opsiClient.inc:98
 msgid "Could not get macAddress for OPSI server !"
 msgstr ""
 
-#: admin/systems/opsi/class_opsiClient.inc:105
-#: admin/systems/opsi/class_opsiClient.inc:193
+#: admin/systems/opsi/class_opsiClient.inc:107
+#: admin/systems/opsi/class_opsiClient.inc:199
 msgid "Could not remove OPSI information"
 msgstr ""
 
diff --git a/personal/locale/ar/fusiondirectory.po b/personal/locale/ar/fusiondirectory.po
index 150d450af3fab87945902818b7c940b7578ca15a..fa73a122b26e75ea92515748c515756b7cedbadb 100644
--- a/personal/locale/ar/fusiondirectory.po
+++ b/personal/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/ca/fusiondirectory.po b/personal/locale/ca/fusiondirectory.po
index ce904375553efb9964dfb36d27fbff4af5bf132f..3d8671a054b275b0a77f37c57b617c64760cc4c6 100644
--- a/personal/locale/ca/fusiondirectory.po
+++ b/personal/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/cs_CZ/fusiondirectory.po b/personal/locale/cs_CZ/fusiondirectory.po
index b01b61792ac932fe9b42c47167fcaf93a9640b2c..25a26e9b819aa32d3824a94d3eff6fbdcde5c642 100644
--- a/personal/locale/cs_CZ/fusiondirectory.po
+++ b/personal/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,7 +37,7 @@ msgstr "IdentifikÃ¡tor tohoto uÅ¾ivatele na tomto webu"
 #: personal/personal/class_personalInfo.inc:85
 #: config/personal/class_personalConfig.inc:42
 msgid "Personal"
-msgstr "OsobnÃ"
+msgstr "osobnÃ"
 
 #: personal/personal/class_personalInfo.inc:86
 msgid "Personal information"
@@ -85,7 +85,7 @@ msgstr "PohlavÃ"
 
 #: personal/personal/class_personalInfo.inc:128
 msgid "Country"
-msgstr "ZemÄ›"
+msgstr "zemÄ›"
 
 #: personal/personal/class_personalInfo.inc:132
 msgid "Start date"
@@ -113,7 +113,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "kontakt"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
@@ -169,4 +169,5 @@ msgstr "UmoÅ¾nit pro obnovu hesla pouÅ¾Ãt soukromÃ½ e-mail"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow users to use their private email address for password recovery"
-msgstr "UmoÅ¾nit uÅ¾ivatelÅ¯m pouÅ¾Ãt svÃ© soukromÃ© e-mailovÃ© adresy pro obnovu hesla"
+msgstr ""
+"UmoÅ¾nit uÅ¾ivatelÅ¯m pouÅ¾Ãt svÃ© soukromÃ© e-mailovÃ© adresy pro obnovu hesla"
diff --git a/personal/locale/de/fusiondirectory.po b/personal/locale/de/fusiondirectory.po
index 944410fe0492a5b4b323589d70b7c9da391f8f56..15a356cbc31f97e0907d389ce0f7d294acec76e5 100644
--- a/personal/locale/de/fusiondirectory.po
+++ b/personal/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:37+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/el_GR/fusiondirectory.po b/personal/locale/el_GR/fusiondirectory.po
index f2f2a9c3c79f9330394fcbeaad7ef1d51cd00cf8..15488b8795d52ec5fc007ede68ea40b2660ddbf5 100644
--- a/personal/locale/el_GR/fusiondirectory.po
+++ b/personal/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -170,4 +169,6 @@ msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï em
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow users to use their private email address for password recovery"
-msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î· Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï email Î³Î¹Î± Î±Î½Î¬ÎºÏ„Î·ÏƒÎ· Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
+msgstr ""
+"ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î· Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï email Î³Î¹Î± Î±Î½Î¬ÎºÏ„Î·ÏƒÎ· "
+"Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
diff --git a/personal/locale/en/fusiondirectory.po b/personal/locale/en/fusiondirectory.po
index 563a6acbc0021a8de82c52550e12464a48a6e069..dafb8f4ae743864c9ad483f670749356cfb13edf 100644
--- a/personal/locale/en/fusiondirectory.po
+++ b/personal/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/personal/locale/es/fusiondirectory.po b/personal/locale/es/fusiondirectory.po
index 88555f1b945c37ea231610a5192807de12ccb16f..ffcc2d3c5d52031f458251510b2e501bf290533c 100644
--- a/personal/locale/es/fusiondirectory.po
+++ b/personal/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/es_CO/fusiondirectory.po b/personal/locale/es_CO/fusiondirectory.po
index e295391c95b5a2122ca46470cc29db4956747fd8..bb4f5a4af28910e9e7158027f0f13686727677b3 100644
--- a/personal/locale/es_CO/fusiondirectory.po
+++ b/personal/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/es_VE/fusiondirectory.po b/personal/locale/es_VE/fusiondirectory.po
index b8180606d3c462f11586f27518061180949a0159..7d07183f0ef4aeb5838e9439d74c3e5bafd2f4ab 100644
--- a/personal/locale/es_VE/fusiondirectory.po
+++ b/personal/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/fa_IR/fusiondirectory.po b/personal/locale/fa_IR/fusiondirectory.po
index 2ecdf4b1c3f47fbcfddd86a7bbc9fd24b00e5668..270eefe6fc8700e0ed92159bad8d2e67db7dbce9 100644
--- a/personal/locale/fa_IR/fusiondirectory.po
+++ b/personal/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/fi_FI/fusiondirectory.po b/personal/locale/fi_FI/fusiondirectory.po
index 8666dc0bfa474371dd083d91d7fd99f2db99277e..571f14935e9407bb61a227b1940661adb5c58f7f 100644
--- a/personal/locale/fi_FI/fusiondirectory.po
+++ b/personal/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/fr/fusiondirectory.po b/personal/locale/fr/fusiondirectory.po
index 05a0b637c1e373e67b6985ea55cf7a97e3ee2819..a4be525c3869eac3bf3262704bdb9d3bdba755dd 100644
--- a/personal/locale/fr/fusiondirectory.po
+++ b/personal/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +24,7 @@ msgstr "Site"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Website the account is on"
-msgstr "Site web de ce compte"
+msgstr "Site web pour ce compte"
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id"
@@ -46,7 +45,7 @@ msgstr "Informations personnelles"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
-msgstr "Infos personnelles"
+msgstr "Informations personnelles"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title"
@@ -54,7 +53,9 @@ msgstr "Titre personnel"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" and \"Rev\""
-msgstr "Titre personnel - Des exemples de titres sont \"Docteur\", \"Professeur\" et \"RÃ©vÃ¨rent\""
+msgstr ""
+"Titre personnel - Des exemples de titres sont \"Docteur\", \"Professeur\" et"
+" \"RÃ©vÃ¨rent\""
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nickname"
@@ -110,7 +111,9 @@ 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 ?"
+msgstr ""
+"Est ce que la photo de l'utilisateur devrait Ãªtre visible par les "
+"utilisateurs externes ?"
 
 #: personal/personal/class_personalInfo.inc:148
 msgid "Contact"
@@ -118,19 +121,19 @@ msgstr "Contact"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social account"
-msgstr "Compte de rÃ©seau social"
+msgstr "Compte rÃ©seau social"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
-msgstr "Comptes sur les rÃ©seaux sociaux de cet utilisateur"
+msgstr "Compte sur les rÃ©seaux sociaux de cet utilisateur"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
-msgstr "Courriel privÃ©"
+msgstr "Email privÃ©"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
-msgstr "Adresses de courriel privÃ©es de cet utilisateur"
+msgstr "Adresses de messagerie privÃ©es de cet utilisateur"
 
 #: personal/personal/class_socialHandlers.inc:68
 msgid "Facebook"
@@ -166,8 +169,12 @@ msgstr "Configuration du plugin personal"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow use of private email for password recovery"
-msgstr "Autoriser l'utilisation du courriel privÃ© pour la rÃ©cupÃ©ration de mot de passe"
+msgstr ""
+"Autoriser l'utilisation du courriel privÃ© pour la rÃ©cupÃ©ration de mot de "
+"passe"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow users to use their private email address for password recovery"
-msgstr "Autoriser les utilisateurs Ã  utiliser leur adresse de courriel privÃ©e pour la rÃ©cupÃ©ration de mot de passe"
+msgstr ""
+"Autoriser les utilisateurs Ã  utiliser leur adresse de courriel privÃ©e pour "
+"la rÃ©cupÃ©ration de mot de passe"
diff --git a/personal/locale/hu_HU/fusiondirectory.po b/personal/locale/hu_HU/fusiondirectory.po
index 6be6f0798b9e90787ab64fb6f444b50fe79bcd6e..33b41d150fd0b64143394eddf69218e4cc5b94e4 100644
--- a/personal/locale/hu_HU/fusiondirectory.po
+++ b/personal/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/id/fusiondirectory.po b/personal/locale/id/fusiondirectory.po
index d6ffe48e892bf24f925a57d2ce18f2a669911273..e74c83384ef1415bfe16542897dde329af628f0d 100644
--- a/personal/locale/id/fusiondirectory.po
+++ b/personal/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/it_IT/fusiondirectory.po b/personal/locale/it_IT/fusiondirectory.po
index a1c7889bdc67e5a12a12f983b344236e7df696b8..babaa36bae2f2cda0c53029b6740594c4175327c 100644
--- a/personal/locale/it_IT/fusiondirectory.po
+++ b/personal/locale/it_IT/fusiondirectory.po
@@ -1,22 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Maurizio Varriale <mavarriale@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:18+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,7 +53,9 @@ msgstr "Titolo personale"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title - Examples of personal titles are \"Ms\", \"Dr\", \"Prof\" and \"Rev\""
-msgstr "Titolo personale - Esempi di titoli personali sono \"Sig\", \"Dott.\", \"Prof\" e \"Don\""
+msgstr ""
+"Titolo personale - Esempi di titoli personali sono \"Sig\", \"Dott.\", "
+"\"Prof\" e \"Don\""
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nickname"
@@ -174,4 +171,6 @@ msgstr "Permetti l'uso dell'email privata per recuperare la password"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow users to use their private email address for password recovery"
-msgstr "Permette agli utenti l'uso delle loro email private per recuperare la password"
+msgstr ""
+"Permette agli utenti l'uso delle loro email private per recuperare la "
+"password"
diff --git a/personal/locale/lv/fusiondirectory.po b/personal/locale/lv/fusiondirectory.po
index 3243967d94839c302e6cb90ffff9d85b7f9b9f4b..049b4d7c76a5c850f7cd71c4c05eecb7898b9499 100644
--- a/personal/locale/lv/fusiondirectory.po
+++ b/personal/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/nb/fusiondirectory.po b/personal/locale/nb/fusiondirectory.po
index 11eeb338abb27e51e6feac5fa21bb88797f7a08b..48421c9af23765c77ad8cdf0d3dba0a3eeb84da7 100644
--- a/personal/locale/nb/fusiondirectory.po
+++ b/personal/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/nl/fusiondirectory.po b/personal/locale/nl/fusiondirectory.po
index 902f496255b21e936f2dcb7d32b85d0a7ae61077..8db7236e4d4fc0225bc366a2e883ccd7afdfb757 100644
--- a/personal/locale/nl/fusiondirectory.po
+++ b/personal/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Site"
-msgstr ""
+msgstr "Site"
 
 #: personal/personal/class_personalInfo.inc:30
 msgid "Website the account is on"
@@ -27,7 +28,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 #: personal/personal/class_personalInfo.inc:36
 msgid "Id of this user on this website"
@@ -44,7 +45,7 @@ msgstr "Persoonlijke informatie"
 
 #: personal/personal/class_personalInfo.inc:101
 msgid "Personal info"
-msgstr ""
+msgstr "Persoonlijke informatie"
 
 #: personal/personal/class_personalInfo.inc:104
 msgid "Personal title"
@@ -56,19 +57,19 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nickname"
-msgstr ""
+msgstr "Bijnaam"
 
 #: personal/personal/class_personalInfo.inc:109
 msgid "Nicknames for this user"
-msgstr ""
+msgstr "Bijnaam van deze user"
 
 #: personal/personal/class_personalInfo.inc:114
 msgid "Badge Number"
-msgstr ""
+msgstr "Badge nummer"
 
 #: personal/personal/class_personalInfo.inc:114
 msgid "Company badge number"
-msgstr ""
+msgstr "Bedrijf badge nummer"
 
 #: personal/personal/class_personalInfo.inc:118
 msgid "Date of birth"
@@ -80,7 +81,7 @@ msgstr "Geslacht"
 
 #: personal/personal/class_personalInfo.inc:123
 msgid "Gender"
-msgstr ""
+msgstr "Geslacht"
 
 #: personal/personal/class_personalInfo.inc:128
 msgid "Country"
@@ -88,7 +89,7 @@ msgstr "Land"
 
 #: personal/personal/class_personalInfo.inc:132
 msgid "Start date"
-msgstr ""
+msgstr "Start datum"
 
 #: personal/personal/class_personalInfo.inc:132
 msgid "Date this user joined the company"
@@ -96,7 +97,7 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:137
 msgid "End date"
-msgstr ""
+msgstr "Eind datum"
 
 #: personal/personal/class_personalInfo.inc:137
 msgid "Date this user is supposed to leave the company"
@@ -124,23 +125,23 @@ msgstr ""
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
-msgstr ""
+msgstr "PrivÃ© e-mail"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email addresses of this user"
-msgstr ""
+msgstr "PrivÃ© e-mail adres voor deze gebruiker"
 
 #: personal/personal/class_socialHandlers.inc:68
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: personal/personal/class_socialHandlers.inc:78
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: personal/personal/class_socialHandlers.inc:98
 msgid "Google+"
-msgstr ""
+msgstr "Google+"
 
 #: personal/personal/class_socialHandlers.inc:118
 msgid "Diaspora*"
@@ -152,11 +153,11 @@ msgstr ""
 
 #: personal/personal/class_socialHandlers.inc:141
 msgid "LinkedIn"
-msgstr ""
+msgstr "LinkedIn"
 
 #: config/personal/class_personalConfig.inc:28
 msgid "Personal configuration"
-msgstr ""
+msgstr "Persoonlijke configuratie"
 
 #: config/personal/class_personalConfig.inc:29
 msgid "FusionDirectory personal plugin configuration"
diff --git a/personal/locale/pl/fusiondirectory.po b/personal/locale/pl/fusiondirectory.po
index 9554f0595a0b8cfbae2a841197d0b9071fbb6f96..92736b3172b0cd72f863eb7fe327182690c64c2b 100644
--- a/personal/locale/pl/fusiondirectory.po
+++ b/personal/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/pt/fusiondirectory.po b/personal/locale/pt/fusiondirectory.po
index 380e4550ef824cb11ca83976c3f1b76dd577e2c1..482e4a90665676e1a005294c0248fc89f0a4858c 100644
--- a/personal/locale/pt/fusiondirectory.po
+++ b/personal/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/pt_BR/fusiondirectory.po b/personal/locale/pt_BR/fusiondirectory.po
index 6641694dc2e500bf7dc1684f410c6a0c02399564..fd18534610cec9b223043314ec0e512ce09d6f85 100644
--- a/personal/locale/pt_BR/fusiondirectory.po
+++ b/personal/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/ru/fusiondirectory.po b/personal/locale/ru/fusiondirectory.po
index 0f4a576cc7f1c90e8091f63c60a5607adaa91bcd..75ac855af2467080de106740400924c80099ab3a 100644
--- a/personal/locale/ru/fusiondirectory.po
+++ b/personal/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +37,7 @@ msgstr "Ð˜Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑÐ°Ð¹
 #: personal/personal/class_personalInfo.inc:85
 #: config/personal/class_personalConfig.inc:42
 msgid "Personal"
-msgstr "Ð›Ð¸Ñ‡Ð½Ð°Ñ"
+msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
 
 #: personal/personal/class_personalInfo.inc:86
 msgid "Personal information"
@@ -122,7 +121,8 @@ msgstr "ÐÐºÐºÐ°ÑƒÐ½Ñ‚ Ð² ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐµÑ‚ÑÑ…"
 
 #: personal/personal/class_personalInfo.inc:152
 msgid "Social accounts of this user"
-msgstr "ÐŸÐ¾Ð´ ÐºÐ°ÐºÐ¾Ð¹ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÑŒÑŽ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð² ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐµÑ‚ÑÑ…"
+msgstr ""
+"ÐŸÐ¾Ð´ ÐºÐ°ÐºÐ¾Ð¹ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÑŒÑŽ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ð½ Ð² ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½Ñ‹Ñ… ÑÐµÑ‚ÑÑ…"
 
 #: personal/personal/class_personalInfo.inc:159
 msgid "Private email"
@@ -166,8 +166,12 @@ msgstr "Ð›Ð¸Ñ‡Ð½Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² FusionDirectory"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow use of private email for password recovery"
-msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+msgstr ""
+"ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ "
+"Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
 #: config/personal/class_personalConfig.inc:45
 msgid "Allow users to use their private email address for password recovery"
-msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+msgstr ""
+"ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ "
+"Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
diff --git a/personal/locale/ru@petr1708/fusiondirectory.po b/personal/locale/ru@petr1708/fusiondirectory.po
index 65a43d172c1deabbaaf67609a6193f211d0e4074..53b9540a61cbecc23fc6785e64dce1f48434031c 100644
--- a/personal/locale/ru@petr1708/fusiondirectory.po
+++ b/personal/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/sv/fusiondirectory.po b/personal/locale/sv/fusiondirectory.po
index ee9d0fa5f3c5b9b664796e637f3ad3aeccd7ddfb..47659e01130df81bfe01a038f363e2c8d2a4347f 100644
--- a/personal/locale/sv/fusiondirectory.po
+++ b/personal/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/ug/fusiondirectory.po b/personal/locale/ug/fusiondirectory.po
index 1dd6d686cb4c2c3449c5f7fedc3f31ad51b886ef..3d2fc0d12ee4bde3e702a6ce59e8cd274afd9a73 100644
--- a/personal/locale/ug/fusiondirectory.po
+++ b/personal/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/vi_VN/fusiondirectory.po b/personal/locale/vi_VN/fusiondirectory.po
index a5a2c00a6f8643910854d5da8291a4285ac76c38..2439cc31d364a61ad66b4175f34167711378ae9d 100644
--- a/personal/locale/vi_VN/fusiondirectory.po
+++ b/personal/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/locale/zh/fusiondirectory.po b/personal/locale/zh/fusiondirectory.po
index f8c703cb753c229cdf26360293d1b14da59b1d3e..b44c1a8281fd6c64b25a58c1fd8ea0d46e16352a 100644
--- a/personal/locale/zh/fusiondirectory.po
+++ b/personal/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/personal/personal/personal/class_personalInfo.inc b/personal/personal/personal/class_personalInfo.inc
index 176daea2dea24d2cbf718d0632a1dbd0d9940ad0..5a86a51a432fde64ad8820a7536f1515173c43e8 100644
--- a/personal/personal/personal/class_personalInfo.inc
+++ b/personal/personal/personal/class_personalInfo.inc
@@ -128,15 +128,15 @@ class personalInfo extends simplePlugin
             _('Country'), _('Country'),
             'co', FALSE
           ),
-          new DateAttribute (
+          new GeneralizedTimeDateAttribute (
             _('Start date'), _('Date this user joined the company'),
             'fdContractStartDate', FALSE,
-            'YmdHis\Z', ''
+            ''
           ),
-          new DateAttribute (
+          new GeneralizedTimeDateAttribute (
             _('End date'), _('Date this user is supposed to leave the company'),
             'fdContractEndDate', FALSE,
-            'YmdHis\Z', ''
+            ''
           ),
           new BooleanAttribute (
             _('Photo Visible'), _('Should the photo of the user be visible on external tools'),
diff --git a/personal/personal/personal/class_socialHandlers.inc b/personal/personal/personal/class_socialHandlers.inc
index 33020956c3652ea7f8d795633c7de2a2b678d435..0663b1232a5e4a9278357fbbe57881b8cfb6628f 100644
--- a/personal/personal/personal/class_socialHandlers.inc
+++ b/personal/personal/personal/class_socialHandlers.inc
@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class socialHandlerInvalidValueException extends Exception
+class socialHandlerInvalidValueException extends FusionDirectoryException
 {
 }
 
diff --git a/posix/admin/groups/posix/class_posixGroup.inc b/posix/admin/groups/posix/class_posixGroup.inc
new file mode 100644
index 0000000000000000000000000000000000000000..ca8e44d0ca8f78cb664a3b0b71b1884a32bff29d
--- /dev/null
+++ b/posix/admin/groups/posix/class_posixGroup.inc
@@ -0,0 +1,221 @@
+<?php
+
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2003  Cajus Pollmeier
+  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 posixGroup extends simplePlugin
+{
+  public $objectclasses = array('posixGroup');
+  protected $locks      = array();
+
+  static function plInfo()
+  {
+    if (class_available('mixedGroup')) {
+      return array();
+    }
+    return array(
+      'plShortName'   => _('Group'),
+      'plDescription' => _('POSIX group information'),
+      'plSelfModify'  => FALSE,
+      'plObjectType'  => array('group' => array(
+        'name'        => _('POSIX group'),
+        'description' => _('POSIX user group'),
+        'ou'          => get_ou('groupRDN'),
+        'filter'      => 'objectClass=posixGroup',
+        'icon'        => 'geticon.php?context=types&icon=user-group&size=16',
+        'mainAttr'    => 'cn',
+      )),
+      'plForeignKeys'  => array(
+        'memberUid' => array('user','uid')
+      ),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Properties'),
+        'attrs' => array(
+          new BaseSelectorAttribute(get_ou('groupRDN')),
+          new StringAttribute(
+            _('Name'), _('Name of this group'),
+            'cn', TRUE,
+            '', '', (strict_uid_mode() ? '/^[a-z0-9_-]+$/' : '/^[a-z0-9_.-]+$/i')
+          ),
+          new TextAreaAttribute(
+            _('Description'), _('Short description of this group'),
+            'description', FALSE
+          ),
+          new BooleanAttribute(
+            _('Force GID'), _('Force GID value for this group'),
+            'force_id', FALSE
+          ),
+          new IntAttribute(
+            _('GID'), _('GID value for this group'),
+            'gidNumber', FALSE,
+            0, FALSE, ''
+          )
+        )
+      ),
+      'members' => array(
+        'name'  => _('Group members'),
+        'attrs' => array(
+          new UsersAttribute(
+            '', _('Group members'),
+            'memberUid', FALSE,
+            array(), 'uid'
+          )
+        )
+      ),
+      'system_trust' => array(
+        'name'  => _('System trust'),
+        'icon'  => 'geticon.php?context=status&icon=locked&size=16',
+        'attrs' => array(
+          new SelectAttribute(
+            _('Trust mode'), _('Type of authorization for those hosts'),
+            'trustMode', FALSE,
+            array('', 'fullaccess', 'byhost'),
+            '',
+            array(_('disabled'), _('full access'), _('allow access to these hosts'))
+          ),
+          new SystemsAttribute(
+            '', _('Only allow this group to connect to this list of hosts'),
+            'host', FALSE
+          )
+        )
+      )
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    parent::__construct($dn, $object, $parent, $mainTab);
+
+    $this->attributesAccess['trustMode']->setInLdap(FALSE);
+    $this->attributesAccess['trustMode']->setManagedAttributes(
+      array(
+        'multiplevalues' => array('notbyhost' => array('','fullaccess')),
+        'erase' => array(
+          'notbyhost' => array('host')
+        )
+      )
+    );
+    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
+      $this->trustMode = 'fullaccess';
+    } elseif (count($this->host) > 0) {
+      $this->trustMode = 'byhost';
+    }
+
+    $this->attributesAccess['gidNumber']->setUnique(TRUE);
+    $this->attributesAccess['force_id']->setInLdap(FALSE);
+    $this->attributesAccess['force_id']->setManagedAttributes(
+      array(
+        'disable' => array (
+          FALSE => array (
+            'gidNumber',
+          )
+        )
+      )
+    );
+  }
+
+  function check()
+  {
+    global $config;
+    $message = parent::check();
+
+    /* Check ID's if they are forced by user */
+    if ($this->force_id) {
+      if ($this->gidNumber < $config->get_cfg_value("minId")) {
+        $message[] = msgPool::toosmall(_("GID"), $config->get_cfg_value("minId"));
+      }
+    }
+
+    return $message;
+  }
+
+  function resetCopyInfos()
+  {
+    parent::resetCopyInfos();
+
+    $this->force_id = FALSE;
+    $this->attributesAccess['gidNumber']->setInitialValue("");
+    $this->gidNumber = "";
+  }
+
+  function prepare_save()
+  {
+    if (!$this->force_id) {
+      /* Handle gidNumber */
+      if ($this->attributesAccess['gidNumber']->getInitialValue() != "") {
+        $this->gidNumber = $this->attributesAccess['gidNumber']->getInitialValue();
+      } else {
+        $this->gidNumber = posixAccount::getNextIdLock('gidNumber', $this->dn);
+        $this->locks[] = 'gidNumber';
+      }
+    }
+
+    parent::prepare_save();
+
+    if ($this->trustMode == 'fullaccess') {
+      $this->attrs['host'] = array('*');
+    }
+
+    /* Trust accounts */
+    if (($this->trustMode != "") && !in_array('hostObject', $this->attrs['objectClass'])) {
+      $this->attrs['objectClass'][] = 'hostObject';
+    } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
+      unset($this->attrs['objectClass'][$key]);
+    }
+  }
+
+  function save()
+  {
+    $errors = parent::save();
+
+    foreach ($this->locks as $lock) {
+      del_lock($lock);
+    }
+    $this->locks = array();
+
+    return $errors;
+  }
+
+  function addUser($dn, $uid)
+  {
+    $this->attributesAccess['memberUid']->addValue($dn,
+      array(
+        'dn'  => $dn,
+        'uid' => array($uid),
+        'cn'  => array($uid)
+      )
+    );
+  }
+
+  function removeUser($uid)
+  {
+    $this->attributesAccess['memberUid']->searchAndRemove($uid);
+  }
+}
+
+?>
diff --git a/posix/config/posix/class_posixConfig.inc b/posix/config/posix/class_posixConfig.inc
new file mode 100644
index 0000000000000000000000000000000000000000..9282a321a34b6e2672cc8591a35ff0949fd08273
--- /dev/null
+++ b/posix/config/posix/class_posixConfig.inc
@@ -0,0 +1,139 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2015-2017 FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class posixConfig extends simplePlugin
+{
+  var $objectclasses = array();
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('POSIX configuration'),
+      'plDescription'   => _('FusionDirectory POSIX plugin configuration'),
+      'plSelfModify'    => FALSE,
+      'plCategory'      => array('configuration'),
+      'plObjectType'    => array('smallConfig'),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Posix'),
+        'class' => array('critical'),
+        'attrs' => array(
+          new IntAttribute (
+            _('Group/user min id'),
+            _('The minimum assignable user or group id to avoid security leaks with id 0 accounts.'),
+            'fdMinId', FALSE,
+            0, FALSE, 100
+          ),
+          new StringAttribute (
+            _('Next id hook'), _('A script to be called for finding the next free id number for users or groups.'),
+            'fdNextIdHook', FALSE
+          ),
+          new IntAttribute (
+            _('Base number for user id'),
+            _('Where to start looking for a new free user id.'),
+            'fdUidNumberBase', FALSE,
+            0, FALSE, 1100
+          ),
+          new IntAttribute (
+            _('Base number for group id'),
+            _('Where to start looking for a new free group id.'),
+            'fdGidNumberBase', FALSE,
+            0, FALSE, 1100
+          ),
+          new SelectAttribute (
+            _('Id allocation method'), _('Method to allocate user/group ids'),
+            'fdIdAllocationMethod', TRUE,
+            array('traditional', 'pool'), 'traditional',
+            array(_('Traditional'), _('Samba unix id pool'))
+          ),
+          new IntAttribute (
+            _('Pool user id min'), _('Minimum value for user id when using pool method'),
+            'fdUidNumberPoolMin', FALSE,
+            0, FALSE, 10000
+          ),
+          new IntAttribute (
+            _('Pool user id max'), _('Maximum value for user id when using pool method'),
+            'fdUidNumberPoolMax', FALSE,
+            0, FALSE, 40000
+          ),
+          new IntAttribute (
+            _('Pool group id min'), _('Minimum value for group id when using pool method'),
+            'fdGidNumberPoolMin', FALSE,
+            0, FALSE, 10000
+          ),
+          new IntAttribute (
+            _('Pool group id max'), _('Maximum value for group id when using pool method'),
+            'fdGidNumberPoolMax', FALSE,
+            0, FALSE, 40000
+          ),
+        )
+      ),
+      'shells' => array(
+        'name'  => _('Shells'),
+        'attrs' => array(
+          new SetAttribute(
+            new StringAttribute (
+              _('Available shells'), _('Available POSIX shells for FD users.'),
+              'fdShells', FALSE
+            ),
+            array('/bin/ash','/bin/bash','/bin/csh','/bin/sh','/bin/ksh',
+                  '/bin/tcsh','/bin/dash','/bin/zsh','/sbin/nologin', '/bin/false', '/usr/bin/git-shell')
+          ),
+          new SelectAttribute (
+            _('Default shell'), _('Shell used by default when activating Unix tab.'),
+            'fdDefaultShell', TRUE
+          ),
+        )
+      ),
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE, $attributesInfo = NULL)
+  {
+    parent::__construct($dn, $object, $parent, $mainTab, $attributesInfo);
+
+    $this->attributesAccess['fdDefaultShell']->setChoices($this->fdShells);
+
+    $this->attributesAccess['fdIdAllocationMethod']->setManagedAttributes(
+      array(
+        'erase' => array (
+          'traditional' => array (
+            'fdUidNumberPoolMin','fdUidNumberPoolMax',
+            'fdGidNumberPoolMin','fdGidNumberPoolMax',
+          )
+        )
+      )
+    );
+  }
+
+  function save_object()
+  {
+    parent::save_object();
+    $this->attributesAccess['fdDefaultShell']->setChoices($this->fdShells);
+  }
+}
+?>
diff --git a/posix/locale/ar/fusiondirectory.po b/posix/locale/ar/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8d0124453f6770330eb574f613e34bfa27553b5b
--- /dev/null
+++ b/posix/locale/ar/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "ØªÙ„Ù‚Ø§Ø¦ÙŠ"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "ØªØØ°ÙŠØ±"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Ø®Ø·Ø£"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø©"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Ø§Ù„Ø¥Ø³Ù…"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Ø§Ù„ÙˆØµÙ"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/ca/fusiondirectory.po b/posix/locale/ca/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..96ecbec0e680602d2baed612c80fe16c2e2081f9
--- /dev/null
+++ b/posix/locale/ca/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Directori personal"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "IntÃ¨rpret d'ordres"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Compte"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "AvÃs"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Error"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Error d'LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nom"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/cs_CZ/fusiondirectory.po b/posix/locale/cs_CZ/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..62b0ea516cde32fb34dfb818ef136148df69c3f1
--- /dev/null
+++ b/posix/locale/cs_CZ/fusiondirectory.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "upravit POSIXovÃ¡ nastavenÃ uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "domovskÃ½ adresÃ¡Å™"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "UmÃstÄ›nÃ domovskÃ© sloÅ¾ky tohoto uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "KterÃ½ shell by mÄ›l bÃ½t pouÅ¾it, kdyÅ¾ se uÅ¾ivatel pÅ™ihlÃ¡sÃ"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "nenastavenÃ©"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "hlavnÃ skupina"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "HlavnÃ skupina tohoto uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "stav"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Stav tohoto unixovÃ©ho uÅ¾ivatelskÃ©ho ÃºÄtu"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Vynutit konkrÃ©tnÃ identifikÃ¡tor uÅ¾ivatele/skupiny"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+"Pro tohoto uÅ¾ivatele vynutit konkrÃ©tnÃ identifikÃ¡tory uÅ¾ivatele a jeho "
+"hlavnÃ skupiny"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "IdentifikÃ¡tor uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Hodnota identifikÃ¡toru ÃºÄtu tohoto uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "IdenifikÃ¡tor skupiny"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Hodnota identifikÃ¡toru hlavnÃ skupiny tohoto uÅ¾ivatele"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "ÄlenstvÃ ve skupinÃ¡ch"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "ÃºÄet"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "UÅ¾ivatel musÃ pÅ™i prvnÃm pÅ™ihlÃ¡Å¡enÃ zmÄ›nit heslo."
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"PÅ™i prvnÃm pÅ™ihlÃ¡Å¡enÃ musÃ uÅ¾ivatel zmÄ›nit heslo (vyÅ¾aduje nastavenou "
+"hodnotu u Prodleva pÅ™ed vynucenÃm zmÄ›ny hesla)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "Prodleva pÅ™ed vynucenÃm zmÄ›ny hesla (dny)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"Po tomto poÄtu dnÅ¯ bude uÅ¾ivatel pÅ™imÄ›n ke zmÄ›nÄ› hesla (nevyplnÄ›nÃ funkce "
+"vypÃnÃ¡)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Datum skonÄenÃ platnosti hesla"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Datum po kterÃ©m skonÄÃ platnost hesla uÅ¾ivatele (nevyplnÄ›nÃ tuto funkci "
+"vypÃnÃ¡)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "DÃ©lka neÄinnosti uÅ¾ivatele, po kterÃ© bude ÃºÄet uÅ¾ivatele vypnut (dny)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Po skonÄenÃ platnosti hesla, jak dlouho nanejvÃ½Å¡ mÅ¯Å¾e bÃ½t ÃºÄet nepouÅ¾ÃvÃ¡n, "
+"neÅ¾ dojde k jeho vypnutÃ (zÅ¯stane ovÅ¡em zachovÃ¡n). NevyplnÄ›nÃ tuto funkci "
+"vypÃnÃ¡"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "Prodleva varovÃ¡nÃ uÅ¾ivatele pÅ™ed skonÄenÃm platnosti hesla (dny)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"UÅ¾ivatel bude varovÃ¡n nastavenÃ½ poÄet dnÅ¯ pÅ™edem pÅ™ed skonÄenÃm platnosti "
+"hesla (nevyplnÄ›nÃ tuto funkci vypÃnÃ¡)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "systÃ©m dÅ¯vÄ›ryhodnosti"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "reÅ¾im dÅ¯vÄ›ryhodnosti"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Typ ovÄ›Å™ovÃ¡nÃ pro tyto stroje"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "zakÃ¡zÃ¡no"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "plnÃ½ pÅ™Ãstup"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "povolit pÅ™Ãstup k tÄ›mto strojÅ¯m"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Tomuto uÅ¾ivateli povolit pÅ™ipojenÃ pouze na poÄÃtaÄe z tohoto seznamu"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatickÃ©"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "platnost skonÄila"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "bÄ›Å¾Ã Äas odkladu"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "aktivnÃ"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "platnost hesla skonÄila"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "heslo nelze zmÄ›nit"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Skupina uÅ¾ivatele %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "varovÃ¡nÃ"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "chyba"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "NenÃ k dispozici volnÃ© ID:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "chyba LDAPu"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "IdentifikÃ¡tor sambaUnixIdPool nenÃ jedineÄnÃ½!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "NenÃ k dispozici ID!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "pÅ™ekroÄen maximÃ¡lnÃ poÄet neÃºspÄ›Å¡nÃ½ch pokusÅ¯!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "NenÃ k dispozici volnÃ© ID â€“ nenÃ co pÅ™idÄ›lit!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "nextIdHook nenÃ k dispozici. Bude pouÅ¾it vÃ½chozÃ zÃ¡klad!"
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "POSIX"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr "NejniÅ¾Å¡Ã identifikÃ¡tor skupiny/uÅ¾ivatele"
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+"NejniÅ¾Å¡Ã umoÅ¾nÄ›nÃ½ pÅ™iÅ™aditelnÃ½ identifikÃ¡tor uÅ¾ivatele Äi skupiny pro "
+"vylouÄenÃ bezpeÄnostnÃch prÅ¯nikÅ¯ s ÃºÄty s identifikÃ¡torem 0 (root)."
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr "HÃ¡Äek pÅ™ÃÅ¡tÃho identifikÃ¡toru"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"Skript, kterÃ½ mÃ¡ bÃ½t volÃ¡n pro nalezenÃ dalÅ¡Ãho volnÃ©ho identifikÃ¡toru pro "
+"uÅ¾ivatele nebo skupiny."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "Od jakÃ©ho ÄÃsla zaÄÃt pÅ™idÄ›lovat identifikÃ¡tory uÅ¾ivatelÅ¯"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "Kde zaÄÃt s hledÃ¡nÃm volnÃ½ch identifikÃ¡torÅ¯ pro novÃ© uÅ¾ivatele."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "Od jakÃ©ho ÄÃsla zaÄÃt pÅ™idÄ›lovat identifikÃ¡tory skupin"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "Kde zaÄÃt s hledÃ¡nÃm volnÃ½ch identifikÃ¡torÅ¯ pro novÃ© skupiny."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "Metoda pÅ™iÅ™azovÃ¡nÃ identifikÃ¡torÅ¯"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "ZpÅ¯sob pÅ™iÅ™azovÃ¡nÃ identifikÃ¡torÅ¯ uÅ¾ivatelÅ¯/skupin"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "TradiÄnÃ"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Rozsah unixovÃ½ch identifikÃ¡torÅ¯ pro Samba"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr "NejniÅ¾Å¡Ã identifikÃ¡tor uÅ¾ivatele"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+"NejniÅ¾Å¡Ã umoÅ¾nÄ›nÃ¡ hodnota pro identifikÃ¡tor uÅ¾ivatele pÅ™i pouÅ¾itÃ zpÅ¯sobu "
+"rozsahu"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr "NejvyÅ¡Å¡Ã identifikÃ¡tor uÅ¾ivatele"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+"NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ hodnota pro identifikÃ¡tor uÅ¾ivatele pÅ™i pouÅ¾itÃ zpÅ¯sobu "
+"rozsahu"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr "NejniÅ¾Å¡Ã identifikÃ¡tor skupiny"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+"NejniÅ¾Å¡Ã umoÅ¾nÄ›nÃ¡ hodnota pro identifikÃ¡tor skupiny pÅ™i pouÅ¾itÃ zpÅ¯sobu "
+"rozsahu"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr "NejvyÅ¡Å¡Ã identifikÃ¡tor skupiny"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+"NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ¡ hodnota pro identifikÃ¡tor skupiny pÅ™i pouÅ¾itÃ zpÅ¯sobu "
+"rozsahu"
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "DostupnÃ© shelly"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "POSIX shelly, dostupnÃ© pro uÅ¾ivatele F.D."
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "skupina"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "Informace o POSIX skupinÄ›"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "POSIX skupina"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "POSIX skupina uÅ¾ivatelÅ¯"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "vlastnosti"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "nÃ¡zev"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "NÃ¡zev tÃ©to skupiny"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "popis"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "StruÄnÃ½ popis tÃ©to skupiny"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "vynutit GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Vynutit konkrÃ©tnÃ identifikÃ¡tor pro tuto skupinu"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "IdentifikÃ¡tor (GID) pro tuto skupinu"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "ÄlenovÃ© skupiny"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr "TÃ©to skupinÄ› umoÅ¾nit pÅ™ipojenÃ pouze na stroje z tohoto seznamu"
diff --git a/posix/locale/de/fusiondirectory.po b/posix/locale/de/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ffe7273dbfc9b5b38068f3a91f1da09338375acc
--- /dev/null
+++ b/posix/locale/de/fusiondirectory.po
@@ -0,0 +1,488 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Benutzer POSIX-Einstellungen bearbeiten"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Basisverzeichnis"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "Der Pfad zum Heimatverzeichnis fÃ¼r diesen Benutzer"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+"Welche Shell soll verwendet werden, wenn dieser Benutzer sich einloggt"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "unkonfiguriert"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "PrimÃ¤re Gruppe"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "PrimÃ¤re Gruppe fÃ¼r diesen Benutzer"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Status"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Status dieses Benutzer unixkontos"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Benutzer-/Gruppenkennung erzwingen"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+"Benutzerkennungs- und Gruppenkennungswerte fÃ¼r diesen Benutzer erzwingen"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "Benutzerkennung"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Benutzerkennwert fÃ¼r diesen Benutzer"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "Gruppenkennung"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Gruppenkennwert fÃ¼r diesen Benutzer"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Gruppenmitgliedschaft"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Konto"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "Benutzer muss beim ersten Anmelden sein Passwort Ã¤ndern"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"Benutzer muss das Passwort bei der ersten Anmeldung Ã¤ndern (benÃ¶tigt einen "
+"Wert fÃ¼r die VerzÃ¶gerung, bevor die PasswortÃ¤nderung erzwungen wird)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr "MindestverzÃ¶gerung zwischen PasswortÃ¤nderungen (Tage)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+"Der Benutzer kann sein Passwort nicht vor dieser Anzahl an Tagen Ã¤ndern (zum"
+" Deaktivieren leer lassen)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "VerzÃ¶gerung bevor die PasswortÃ¤nderung forciert wird (Tage)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"Der Benutzer wird gezwungen werden, sein Passwort nach dieser Anzahl von "
+"Tagen zu Ã¤ndern (Leer lassen zum Deaktivieren)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Passwort Ablaufdatum"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Datum nach dem dieses Benutzerpasswort ablaufen wird (leer lassen zur "
+"Deaktivierung)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+"VerzÃ¶gerung von InaktivitÃ¤t bevor der Benutzer deaktiviert wird (Tage)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Maximale VerzÃ¶gerung der InaktivitÃ¤t nach Passwortablauf bevor der Benutzer "
+"deaktiviert wird (leer lassen zum Deaktivieren)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "VerzÃ¶gerung fÃ¼r Benutzerwarnung vor Passwortablauf (Tage)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"Der Benutzer wird diese Anzahl an Tagen vorher gewarnt, bevor sein Passwort "
+"auflÃ¤uft (leer lassen zum Deaktivieren)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "System-Vertrauen"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Vertrauens-Modus"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Art der Authorisierung fÃ¼r diese Hosts"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "deaktiviert"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Vollzugriff"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "erlaube Zugriff auf diese Hosts"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatisch"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "abgelaufen"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Nachfrist aktiv"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "aktiv"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "Passwort abgelaufen"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "Passwort kann nicht geÃ¤ndert werden"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Gruppe des Benutzers %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Warnung"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Fehler"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Konnte keine freie ID allozieren:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP-Fehler"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool ist nicht eindeutig!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "keine ID verfÃ¼gbar!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "maximale Anzahl von Versuchen abgelaufen!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Konnte keine freie ID allozieren!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "'nextIdHook' ist nicht verfÃ¼gbar. Benutze Standardbasis!"
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr "Nachster id hook"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "Basisnummer fÃ¼r Benutzerkennung"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+"Wo mit der Suche nach einer neuen freien user id gestartet werden soll."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "Basisnummer fÃ¼r Gruppenkennung"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+"Wo nach der Suche nach einer neuen freien group-ID geschaut werden soll."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "Id-Zuweisungsmethode"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Traditionell"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Samba unix id pool"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "VerfÃ¼gbare Shells"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "VerfÃ¼gbare POSIX-Shells fÃ¼r FD-Benutzer."
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Gruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "POSIX-Gruppeninformation"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "POSIX-Gruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "POSIX-Benutzergruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Name"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Name dieser Gruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Beschreibung"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "Kurze Beschreibung dieser Gruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Erzwinge GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "GID-Wert fÃ¼r diese Gruppe erzwingen"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "GID-Wert fÃ¼r diese Gruppe"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Gruppenmitglieder"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
diff --git a/posix/locale/el_GR/fusiondirectory.po b/posix/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f1c24d24227a2ba9c66c54f5958705e0b6a51af1
--- /dev/null
+++ b/posix/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,489 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ POSIX"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒÏ‚ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "Î— Î´Î¹Î±Î´ÏÎ¿Î¼Î® Î³Î¹Î± Ï„Î¿Î½ Î±ÏÏ‡Î¹ÎºÏŒ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "ÎšÎÎ»Ï…Ï†Î¿Ï‚"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "Î Î¿Î¹Î¿ ÎºÎÎ»Ï…Ï†Î¿Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ ÏŒÏ„Î±Î½ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "Î¼Î· ÏÏ…Î¸Î¼Î¹ÏƒÎ¼ÎÎ½Î¿"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "ÎšÏÏÎ¹Î± Î¿Î¼Î¬Î´Î±"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "ÎšÏÏÎ¹Î± Î¿Î¼Î¬Î´Î± Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï unix Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ user/group id"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+"Î¥Ï€Î¿Ï‡ÏÎÏ‰ÏƒÎ· ÏƒÏ…Î¼Ï€Î»Î®ÏÏ‰ÏƒÎ·Ï‚ Ï„Î¹Î¼ÏŽÎ½ Î³Î¹Î± user id ÎºÎ±Î¹ group id Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "User id"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Î¤Î¹Î¼Î® User id Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î·."
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "Group id"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Î¤Î¹Î¼Î® Group id Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "ÎœÎÎ»Î· Î¿Î¼Î¬Î´Î±Ï‚"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+"ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÎºÎ±Ï„Î¬ Ï„Î·Î½ Ï€ÏÏŽÏ„Î· Ï„Î¿Ï… "
+"ÏƒÏÎ½Î´ÎµÏƒÎ·"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÏ„Î·Î½ Ï€ÏÏŽÏ„Î· ÏƒÏÎ½Î´ÎµÏƒÎ· (Î· Ï„Î¹Î¼Î® ÏƒÏ„Î¿ Ï€ÎµÎ´Î¯Î¿"
+" ÎšÎ±Î¸Ï…ÏƒÏ„ÎÏÎ·ÏƒÎ· Î´Î·Î»ÏŽÎ½ÎµÎ¹ Ï„Î¿ Ï€ÏŒÏƒÎµÏ‚ Ï†Î¿ÏÎÏ‚ Î¼Ï€Î¿ÏÎµÎ¯ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯ Ï€ÏÎ¹Î½ "
+"Î±Î½Î±Î³ÎºÎ±ÏƒÏ„ÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "ÎšÎ±Î¸Ï…ÏƒÏ„ÎÏÎ·ÏƒÎ· Ï€ÏÎ¹Î½ Ï„Î·Î½ Ï…Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ® Î±Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ (ÏƒÎµ Î·Î¼ÎÏÎµÏ‚)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î¸Î± Ï…Ï€Î¿Ï‡ÏÎµÏ‰Î¸ÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ®Ï‚ Ï„Î¿Ï… Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ "
+"Ï„Î¿Î½ Î±ÏÎ¹Î¸Î¼ÏŒ Î·Î¼ÎµÏÏŽÎ½ (Î±Ï†Î®ÏƒÏ„Îµ ÎºÎµÎ½ÏŒ Î³Î¹Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Ï„Î·Î½ Î¿Ï€Î¿Î¯Î± Î¸Î± Î»Î®Î³ÎµÎ¹ Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ (Î±Ï†Î®ÏƒÏ„Îµ ÎºÎµÎ½ÏŒ Î³Î¹Î± "
+"Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "Î—Î¼ÎÏÎµÏ‚ Î±Î´ÏÎ¬Î½ÎµÎ¹Î±Ï‚ Ï€ÏÎ¹Î½ Î±Ï€ÏŒ Ï„Î·Î½ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Î·Î¼ÎµÏÏŽÎ½ Î±Î´ÏÎ¬Î½ÎµÎ¹Î±Ï‚ Î¼ÎµÏ„Î¬ Ï„Î·Î½ Î»Î®Î¾Î· Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Ï€ÏÎ¹Î½ "
+"Ï„Î·Î½ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· (Î±Ï†Î®ÏƒÏ„Îµ ÎºÎµÎ½ÏŒ Î³Î¹Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "Î—Î¼ÎÏÎµÏ‚ Î¼ÎµÏ„Î±Î¾Ï Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ Ï‡ÏÎ®ÏƒÏ„Î· ÎºÎ±Î¹ Î»Î®Î¾Î·Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï:"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î¸Î± Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î±ÏÎ¹Î¸Î¼ÏŒ Ï„Ï‰Î½ Î·Î¼ÎµÏÏŽÎ½ Ï€ÏÎ¹Î½ Î±Ï€ÏŒ Ï„Î· Î»Î®Î¾Î· "
+"Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ®Ï‚ Ï„Î¿Ï… (Î±Ï†Î®ÏƒÏ„Îµ ÎºÎµÎ½ÏŒ Î³Î¹Î± Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Î•Î¼Ï€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î· ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Î›ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± ÎµÏ€Î¹ÏƒÏ„Î¿ÏƒÏÎ½Î·Ï‚"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Î¤ÏÏ€Î¿Ï‚ ÎµÎ¾Î¿Ï…ÏƒÎ¹Î¿Î´ÏŒÏ„Î·ÏƒÎ® Î³Î¹Î± Î±Ï…Ï„Î¬ Ï„Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î±"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Î Î»Î®ÏÎ·Ï‚ Î ÏÏŒÏƒÎ²Î±ÏƒÎ·"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Î½Î± ÎµÏ€Î¹Ï„ÏÎ±Ï€ÎµÎ¯ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î±Ï…Ï„Î¬ Ï„Î± host"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+"Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î¿"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr " ÎÎ»Î·Î¾Îµ"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Ï‡ÏÎ¿Î½Î¹ÎºÏŒ Î´Î¹Î¬ÏƒÏ„Î·Î¼Î± Ï‡Î¬ÏÎ¹Ï„Î¿Ï‚ ÎµÎ½ÎµÏÎ³ÏŒ"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "ÎµÎ½ÎµÏÎ³ÏŒ"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÎÏ‡ÎµÎ¹ Î»Î®Î¾ÎµÎ¹"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "ÎŸÎ¼Î¬Î´Î± Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Î£Ï†Î¬Î»Î¼Î±"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„ÏŒ Î½Î± Î±Î½Î±Ï„ÎµÎ¸ÎµÎ¯ Î¼Î¹Î± free ID:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool  Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î¼Î¿Î½Î±Î´Î¹ÎºÎ®!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "ÎœÎ· Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î· ID!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "Î¥Ï€ÎÏÎ²Î±ÏƒÎ· Î¼ÎµÎ³Î¯ÏƒÏ„Î¿Ï… Î¿ÏÎ¯Î¿Ï… Ï€ÏÎ¿ÏƒÏ€Î±Î¸ÎµÎ¹ÏŽÎ½!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î´Î¹Î¬Î¸ÎµÏƒÎ· Î¼Î¹Î±Ï‚  free ID!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"ÎˆÎ½Î± ÏƒÎµÎ½Î¬ÏÎ¹Î¿ Ï€Î¿Ï… Î¸Î± ÎºÎ»Î·Î¸ÎµÎ¯ Î³Î¹Î± Ï„Î·Î½ ÎµÏÏÎµÏƒÎ· Ï„Î¿Ï… ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿Ï… ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï… id Î³Î¹Î± "
+"Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î® Î¿Î¼Î¬Î´ÎµÏ‚."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î²Î¬ÏƒÎ· Î³Î¹Î± user id"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î± ÎµÏÏÎµÏƒÎ·Ï‚ Î½ÎÎ¿Ï… ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï… user id."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î²Î¬ÏƒÎ· Î³Î¹Î± group id"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î± ÎµÏÏÎµÏƒÎ·Ï‚ Î½ÎÎ¿Ï… ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿Ï… group id."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "ÎœÎÎ¸Î¿Î´Î¿Ï‚ Î´Î¹Î±Î½Î¿Î¼Î®Ï‚ id"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "ÎœÎÎ¸Î¿Î´Î¿Ï‚ Î³Î¹Î± Ï„Î·Î½ Î´Î¹Î±Î½Î¿Î¼Î® user/group id"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Î Î±ÏÎ±Î´Î¿ÏƒÎ¹Î±ÎºÎ®"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "ÎŸÎ¼Î¬Î´Î±"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î¿Î¼Î¬Î´Î±Ï‚ POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "ÎŸÎ¼Î¬Î´Î± POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "ÎŸÎ¼Î¬Î´Î± Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "ÎŒÎ½Î¿Î¼Î±"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "ÎŒÎ½Î¿Î¼Î± Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "Î£ÏÎ½Ï„Î¿Î¼Î· Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¹Î¼Î®Ï‚ GID Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î±"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "Î¤Î¹Î¼Î® GID Î³Î¹Î± Î±Ï…Ï„Î®Î½ Ï„Î·Î½ Î¿Î¼Î¬Î´Î±"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "ÎœÎÎ»Î· Î¿Î¼Î¬Î´Î±Ï‚"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
+"Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
diff --git a/posix/locale/en/fusiondirectory.po b/posix/locale/en/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..b08b43b74e938d573200be5781bb4814323c9516
--- /dev/null
+++ b/posix/locale/en/fusiondirectory.po
@@ -0,0 +1,470 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/es/fusiondirectory.po b/posix/locale/es/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..366b27e0f4e6e738574b98cac2ea98270e5f6bb3
--- /dev/null
+++ b/posix/locale/es/fusiondirectory.po
@@ -0,0 +1,472 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Editar parametros de usuarios POSIX"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Directorio de usuario"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "Sin configurar"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Grupo primario"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Estado"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Pertenencia a grupo"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Cuenta"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+"El usuario debe introducir la contraseÃ±a en el primer inicio de sesiÃ³n"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Sistema de seguridad"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Modo seguro"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "desactivado"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Acceso sin restricciones"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automÃ¡tico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "expirÃ³"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Periodo de gracia activado"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "activo"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "la contraseÃ±a expirÃ³"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "no puede cambiar la contraseÃ±a"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Error"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "No se puede asignar un identificador (ID) libre:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "Â¡%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "Â¡sambaUnixIdPool no es Ãºnico!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "Â¡No hay ID disponibles!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "Â¡Excedido el nÃºmero de intentos mÃ¡ximo!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Â¡No se puede asignar un identificador (ID) libre!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forzar GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Miembros del grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/es_CO/fusiondirectory.po b/posix/locale/es_CO/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ac438865059ddab90973ea419d5a1683c86e5035
--- /dev/null
+++ b/posix/locale/es_CO/fusiondirectory.po
@@ -0,0 +1,489 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Editar configuraciÃ³n POSIX de los usuarios"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "'Home' del usuario"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "La ruta al nuevo directorio 'home' del usuario."
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "QuÃ© 'shells' deberÃan usarse cuando este usuario inicie sesiÃ³n."
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "AÃºn sin configurar"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Grupo Primario"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "Grupo primario para este usuario"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Estado"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Estado de la cuenta Unix de este usuario"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Forzar 'id' de usuario/grupo "
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr "Forzar los valores 'id' y 'group id' para Ã©ste usuario."
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "id de usuario"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Forzar valor 'id' para este usuario"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "id de Grupo"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Forzar valor 'Group id' para este usuario."
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Pertenencia a grupos"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Cuenta de usuario"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "El usuario debe cambiar su contraseÃ±a en el primer inicio de sesiÃ³n."
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"El usuario debe cambiar su contraseÃ±a en el primer inicio de sesiÃ³n "
+"(necesita un valor de retraso antes de forzar el cambio de contraseÃ±a)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "Retraso antes de forzar el cambio de contraseÃ±a (dÃas)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"El usuario serÃ¡ forzado a cambiar su contraseÃ±a despuÃ©s de este nÃºmero de "
+"dÃas (deje vacÃo para deshabilitar)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Fecha de caducidad para la contraseÃ±a"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"La fecha tras la cual la contraseÃ±a de este usuario va a caducar (deje vacÃo"
+" para deshabilitar)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "Retraso de inactividad antes de deshabilitar el usuario (dÃas)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Luego de que caduque la contraseÃ±a del usuario, tiempo mÃ¡ximo de retraso "
+"antes de deshabilitar la cuenta del usuario (deje vacÃo para deshabilitar)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+"Retraso para avisar al usuario sobre el vencimiento de su contraseÃ±a (dÃas)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"El usuario serÃ¡ advertido esta cantidad de dÃas antes de que su contraseÃ±a "
+"caduque (deje vacÃo para deshabilitar)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Confianza del Sistema"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Modo de Confianza"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Tipo de autorizaciÃ³n para Ã©sos equipos"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Acceso Completo"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Permitir acceso a Ã©sos equipos"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Permitir a este usuario conectarse a esta lista de hosts."
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automÃ¡tico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "expirado"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "PerÃodo de gracia activo"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "activo"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "ContraseÃ±a expirada"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "ContraseÃ±a no modificable"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Grupo del usuario %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "PrecacuiÃ³n"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Error"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Error LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "!sambaUnixIdPool no es un valor Ãºnico!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr "Grupo/usuario min id"
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+"El nÃºmero 'id' mÃnimo asignable a un usuario o grupo para evitar fallas de "
+"seguridad como cuentas de usuario con id '0'."
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr "Siguiente id hook"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"Un script que buscarÃ¡ el siguiente nÃºmero \"id\" libre para usuarios o "
+"grupos."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "NÃºmero base para 'id' de usuario"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "DÃ³nde buscar un id libre de usuario."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "NÃºmero base para 'id' de grupo"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "DÃ³nde buscar un id libre de grupo"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "MÃ©todo para asignar 'ids'"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "MÃ©todo para asignar 'ids' de grupo/usuario"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Tradicional"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Samba unix id pool"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr "Pool user id min"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+"Valor mÃnimo para el valor 'id' del usuario cuando utilice el mÃ©todo 'pool'"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr "Pool user id max"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+"Valor mÃ¡ximo para el valor 'id' del usuario cuando utilice el mÃ©todo 'pool'"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr "Pool group id min"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr "Valor mÃnimo para id de 'grupo' cuando se utilice el mÃ©todo 'pool'"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr "Pool group id max"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr "Valor mÃ¡ximo para el group id cuando se utilice el mÃ©todo pool."
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "Shells disponibles"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "Shells POSIX disponibles para usuarios de FD."
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "GRupo"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "InformaciÃ³n de Grupo POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "Grupo POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "Grupo de Usuarios POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Nombre de este grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "Una descripciÃ³n corta de este grupo."
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forzar GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Forzar GID para Ã©ste grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "Valor GID para Ã©ste grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Miembros del Grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
+"Habilitar solamente a Ã©ste grupo para conectarse a Ã©sta lista de equipos."
diff --git a/posix/locale/es_VE/fusiondirectory.po b/posix/locale/es_VE/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..76b34bc2bc419238f79a5187b286ab14d5d84659
--- /dev/null
+++ b/posix/locale/es_VE/fusiondirectory.po
@@ -0,0 +1,472 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Editar parametros de usuarios POSIX"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Directorio de usuario"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "Sin configurar"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Grupo primario"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Estado"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Pertenencia a grupo"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Cuenta"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+"El usuario debe introducir la contraseÃ±a en el primer inicio de sesiÃ³n"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Sistema de seguridad"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Modo seguro"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "desactivado"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Acceso sin restricciones"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Permitir el acceso a estos equipos"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automÃ¡tico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "expirÃ³"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Periodo de gracia activado"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "activo"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "la contraseÃ±a expirÃ³"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "no puede cambiar la contraseÃ±a"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Error"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "No se puede asignar un identificador (ID) libre:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "Â¡%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Error de LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "Â¡sambaUnixIdPool no es Ãºnico!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "Â¡No hay ID disponibles!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "Â¡Excedido el nÃºmero de intentos mÃ¡ximo!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Â¡No se puede asignar un identificador (ID) libre!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Propiedades"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nombre"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "DescripciÃ³n"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forzar GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Miembros del grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/fa_IR/fusiondirectory.po b/posix/locale/fa_IR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..91f54c1fbe6cdb5ef738f9a9c4d05f27e8041bfb
--- /dev/null
+++ b/posix/locale/fa_IR/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Ø®Ø·Ø§"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Ø®Ø·Ø§ÛŒ LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/fi_FI/fusiondirectory.po b/posix/locale/fi_FI/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..868aa2ad7cec2fed1e62c92e11adf7f36af08174
--- /dev/null
+++ b/posix/locale/fi_FI/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Varoitus"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Virhe"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP virhe"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nimi"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Kuvaus"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/fr/fusiondirectory.po b/posix/locale/fr/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..fad050e962c6cb9cc2ae584b600be3e07e216928
--- /dev/null
+++ b/posix/locale/fr/fusiondirectory.po
@@ -0,0 +1,493 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Editer les paramÃ¨tres Unix"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "RÃ©pertoire Home"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "Chemin du rÃ©pertoire \"home\" de cet utilisateur"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "Shell Ã  utiliser lors de la connexion de lâ€™utilisateur"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "non configurÃ©"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Groupe principal"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "Groupe principal de cet utilisateur"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Statut"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Status du compte unix de l'utilisateur"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Forcer lâ€™id dâ€™utilisateur/groupe"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+"Force les valeurs des ids dâ€™utilisateur et de groupe pour cet utilisateur."
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "Id dâ€™utilisateur"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Id dâ€™utilisateur Ã  utiliser pour cet utilisateur"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "Id de groupe"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Id de groupe Ã  utiliser pour cet utilisateur"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Appartenance au groupe"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Compte"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors de sa premiÃ¨re connexion"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors du premier connexion "
+"(laisser vide pour dÃ©sactiver la fonctionnalitÃ©)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr "DÃ©lai minimum entre les changements de mot de passe (jours)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+"L'utilisateur ne sera pas habilitÃ© Ã  changer son mot de passe avant ce "
+"nombre de jour (laisser vide pour dÃ©sactiver)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "DÃ©lai avant de forcer le changement de mot de passe (en jours)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"L'utilisateur sera forcÃ© de changer son mot de passe aprÃ¨s ce nombre de jour"
+" (laisser vide pour dÃ©sactiver)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Date d'expiration du mot de passe"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Date aprÃ¨s laquelle le mot de passe de l'utilisateur va expirÃ© (laisser vide"
+" pour dÃ©sactiver)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "DÃ©lai d'inactivitÃ© avant de dÃ©sactiver l'utilisateur (en jours)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"DÃ©lai maximum d'inactivitÃ© aprÃ¨s l'expiration du mot de passe avant que "
+"l'utilisateur soit dÃ©sactivÃ© (laisser vide pour dÃ©sactiver)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+"DÃ©lai avant d'avertir l'utilisateur de l'expiration de son mot de passe (en "
+"jours)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"L'utilisateur sera averti de ce nombre de jour restant avant l'expiration de"
+" ce mot de passe (laisser vide pour dÃ©sactiver)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "SystÃ¨me de Confiance"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Mode de confiance"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Type d'autorisation pour ces hÃ´tes"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "dÃ©sactivÃ©"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "accÃ¨s complet"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "permettre l'accÃ¨s a ces hÃ´tes"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Autoriser seulement cet utilisateur Ã  se connecter sur cet hÃ´te"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatique"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "expire"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "temps de grÃ¢ce activÃ©"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "actif"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "mot de passe expirÃ©"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "mot de passe non modifiable"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Groupe de l'utilisateur %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Avertissement"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr "MÃ©thode d'allocation inconnueâ€¯pour \"%s\" !"
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr "Le temps d'attente du verrou a Ã©tÃ© dÃ©passÃ©. Verrou ignorÃ© pour %s !"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Erreur"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Impossible d'assigner un ID libre :"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Erreur LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool n'est pas unique !"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "Pas d' ID disponibles !"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "Nombre maximum d'essais dÃ©passÃ©s !"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Impossible d'assigner un ID libre !"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+"'nextIdHook' n'est pas disponible. Utilisation de la base par dÃ©faut !"
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr "Configuration Posix"
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr "Configuration du plugin POSIX"
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr "Id minimum de groupe/utilisateur"
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+"Lâ€™id dâ€™utilisateur ou de groupe minimum assignable pour Ã©viter des risques "
+"de sÃ©curitÃ© avec des id Ã©gales Ã  0."
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+"DÃ©clencheur permettant de dÃ©terminer le prochain identifiant numÃ©rique"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"Un script Ã  appeler pour trouver le prochain id libre pour les utilisateurs "
+"et groupes."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "DÃ©part pour les ids dâ€™utilisateur"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "OÃ¹ commencer Ã  chercher pour un nouvel id dâ€™utilisateur libre."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "DÃ©part pour les ids de groupe"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "Point de dÃ©part pour rechercher un identifiant de groupe libre"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "MÃ©thode de rÃ©partition des Id"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "MÃ©thode pour allouer les ids dâ€™utilisateur et de groupe"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Traditionnel"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Samba unix id pool"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr "Minimum des ids dâ€™utilisateur du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr "Valeur minimum pour les ids dâ€™utilisateur du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr "Maximum des ids dâ€™utilisateur du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr "Valeur maximum pour les ids dâ€™utilisateur du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr "Minimum des ids de groupe du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr "Valeur minimum pour les ids de groupe du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr "Maximum des ids de groupe du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr "Valeur maximum pour les ids de groupe du rÃ©servoir"
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr "Shells"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "Shells disponibles"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr "Shell par dÃ©faut"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr "Shell utilisÃ© par dÃ©faut lors de l'activation du tab Unix."
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Groupes"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "Information du groupe POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "Groupe POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "Groupe dâ€™utilisateurs POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "PropriÃ©tÃ©s"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nom"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Nom du groupe"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Description"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "Description courte pour ce groupe"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forcer le GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Forcer la valeur du GID pour ce groupe"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "GID de ce groupe"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Membre du groupe"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr "Autoriser seulement ce groupe Ã  se connecter sur ces listes d'hÃ´tes"
diff --git a/posix/locale/hu_HU/fusiondirectory.po b/posix/locale/hu_HU/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..5a60ec757666d18ecdb81f9f28c8072fa06d237f
--- /dev/null
+++ b/posix/locale/hu_HU/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "NÃ©v"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Csoport neve"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "LeÃrÃ¡s"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/id/fusiondirectory.po b/posix/locale/id/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c18a2d067858789f698d23edc1e1f78bbc6722fe
--- /dev/null
+++ b/posix/locale/id/fusiondirectory.po
@@ -0,0 +1,470 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/it_IT/fusiondirectory.po b/posix/locale/it_IT/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..26a269081bf4dbe80bc7ffd590bdcf3e559a9fce
--- /dev/null
+++ b/posix/locale/it_IT/fusiondirectory.po
@@ -0,0 +1,491 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Modifica le impostazioni POSIX dell'utente"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Home directory"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "Il path verso la cartella personale di questo utente"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "Quale shell dovrÃ  essere usata quando l'utente sarÃ  connesso"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "non configurato"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Gruppo primario"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "Gruppo primario per questo utente"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Stato"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Stato di questo account utente unix"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "Forza l'id utente/gruppo"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr "Forza valori ID utente e ID gruppo per questo utente"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "Utente"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Valore utente per questo utente"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "numero del Gruppo"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Valore del numero del gruppo per questo utente"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Gruppi di appartenenza"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Account"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "L'utente dovrÃ  cambiare la password alla prima connessione"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"L'utente deve cambiare password al primo login (serve un valore di ritardo "
+"prima di forzare il cambio password)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr "Lasso di tempo minimo tra le modifiche delle password (giorni)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+"L'utente non sarÃ  in grado di cambiare la propria password prima di questo "
+"numero di giorni (lasciare vuoto per disabilitare)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "Richiamo prima dell'obbligo di modifica della password (giorni)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"L'utente sarÃ  obbligato di cambiare la sua password dopo questo numero di "
+"giorni (lasciare vuoto per disabilitare)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Data di scadenza della password"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Data dopo la quale questa password utente scadrÃ  (lasciare vuoto per "
+"disabilitare)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+"Periodo di inattivitÃ  prima della disattivazione dell'account utente "
+"(giorni)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Ritardo massimo di inattivitÃ  dopo la scadenza della password prima che "
+"l'utente venga disabilitato (lasciare vuoto per disabilitare)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "Richiamo per l'utente prima che la password scada (giorni)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"L'utente sarÃ  avvertito questo numero di giorni prima della scadenza della "
+"sua password (lasciare vuoto per disabilitare)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Sistema di fiducia"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "ModalitÃ  di fiducia"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Tipo di autorizzazione per questi host"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "disattivato"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "accesso completo"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "autorizza l'accesso a questi host"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "Scaduto"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Il tempo di grazia Ã¨ attivo"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "Attivo"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "Password scaduta"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "Password non modificabile"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Gruppo di utenti %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr "Metodo di assegnazione ID \"%s\" sconosciuto!"
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr "Timeout durante l'attesa per il blocco. Ignorare blocco da %s!"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Errore"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Impossibile assegnare un ID libero:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Errore LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool non Ã¨ univoco !"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "nessun ID disponibile !"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "Il numero massimo di tentativi Ã¨ stato superato"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Impossibile assegnare un ID libero!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "'prossimo Hook ID\" non Ã© disponibile. Usa una base predefinita!"
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr "COnfigurazione di POSIX"
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr "Configurazione del plugin POSIX dui FusionDirectory"
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr "Gruppo/utente minimo ID"
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+"Il minimo utente o grupp ID assegnabile per evitare perdite di sicurezza con"
+" iaccount ID 0."
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr "Id hook successivo"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"Script da nominare per trovare il prossimo numero ID libero per gli utenti o"
+" i gruppi."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "Numero base per questo ID utente"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "Dove cominciare a cercare un nuovo id libero per un utente."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "Numero base per questo id gruppo"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "Dove cominciare a cercare un nuovo id libero per un gruppo ."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "Metodo di assegnazione Id"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "Metodo per allocare utente / gruppo id"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Tradizionale"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Id del pool di Samba unix"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr "Minimo pool id dell'utente"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr "Valore minimo di un id utente quando si utilizza il metodo pool"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr "Id utente pool max"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr "Valore massimo di un id utente quando si utilizza il metodo pool"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr "Id utente pool min"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr "Valore minimo di un id gruppo quando si utilizza il metodo pool"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr "Id gruppo pool min"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr "Valore massimo di un id gruppo quando si utilizza il metodo pool"
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr "Shell"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "Shell disponibili"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "Shell POSIX disponibili per gli utenti FD"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr "Shell di default"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+"Shell utilizzato per impostazione predefinita durante l'attivazione scheda "
+"Unix."
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "Informazioni gruppo POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "Gruppo POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr "Gruppo utenti POSIX"
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "ProprietÃ "
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nome"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Nome del gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Descrizione"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "Breve descrizione del gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forza il GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Forzare il valore GID per questo gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "Valore GID per questo gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Membri del gruppo"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
diff --git a/posix/locale/lv/fusiondirectory.po b/posix/locale/lv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..92655f0d499a8bd13e460b9ba0bb9206c9349ee0
--- /dev/null
+++ b/posix/locale/lv/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "BrÄ«dinÄjums"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "KÄ¼Å«da"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP kÄ¼Å«da"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "VÄrds "
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Apraksts"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/nb/fusiondirectory.po b/posix/locale/nb/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3a7a15115fc6c5f463e37689e89d4c84105344dc
--- /dev/null
+++ b/posix/locale/nb/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Feil"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP-feil"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Navn"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/nl/fusiondirectory.po b/posix/locale/nl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..9e10e89da3acac62aeff70254deb6ae88c84fbc5
--- /dev/null
+++ b/posix/locale/nl/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Wijzig gebruikers POSIX opties"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Persoonlijke map"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "niet geconfigureerd"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Primaire groep"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Status"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Groep lidmaatschap"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Account"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Systeem vertrouwen"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Vertrouwensmodus"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "gedeactiveerd"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "volledige toegang"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "sta toegang op deze computers toe"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatisch"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "verlopen"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "gratie tijd actief"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "actief"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "paswoord is vervallen"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "paswoord niet wijzigbaar"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Fout"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Kan geen vrij ID  toekennen:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >=%sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP fout"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool is niet uniek!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "Geen ID beschikbaar!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "maximum pogingen overschreden!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Kan geen vrij ID toekennen!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Groep"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "POSIX groep informatie"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "POSIX groep"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Naam"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "Naam van deze groep"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Omschrijving"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Forceer GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "GID waarde voor deze groep"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Groepsleden"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/pl/fusiondirectory.po b/posix/locale/pl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f78f63d6bc17a19b82e4ebd7d998f7eac8800a0e
--- /dev/null
+++ b/posix/locale/pl/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Katalog domowy"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "nieskonfigurowane"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Grupa podstawowa"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Status"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "PrzynaleÅ¼noÅ›Ä‡ do grup"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Konto"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "UÅ¼ytkownik musi zmieniÄ‡ hasÅ‚o przy pierwszym logowaniu"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Zaufanie systemowe"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Tryb zaufania"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "wyÅ‚Ä…czone"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "peÅ‚en dostÄ™p"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "zezwÃ³l na dostÄ™p do tych hostÃ³w"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatyczne"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "wygasÅ‚o"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Czas prolongaty aktywny"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "Aktywne"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "hasÅ‚o wygasÅ‚o"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "hasÅ‚o niezmienialne"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "OstrzeÅ¼enie"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "BÅ‚Ä…d"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "bÅ‚Ä…d LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Grupa"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "WÅ‚aÅ›ciwoÅ›ci"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "ImiÄ™"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Opis"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "WymuÅ› GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "CzÅ‚onkowie grupy"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/pt/fusiondirectory.po b/posix/locale/pt/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c86b5ff7ddafd00ab29bf89425390c3d7b7d1586
--- /dev/null
+++ b/posix/locale/pt/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "DiretÃ³rio pessoal"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "desconfigurado"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "Grupo primÃ¡rio"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Estatus"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Membros do grupo"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Conta"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "O usuÃ¡rio deve alterar sua senha no primeiro acesso"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Sistema de confianÃ§a"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Modo de confianÃ§a"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "desabilitado"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "acesso completo"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "permitir acesso a estas mÃ¡quinas"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automÃ¡tico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "expirado"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "ativo"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "AtenÃ§Ã£o"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Erro"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nome"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "ForÃ§ar GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Membros do grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/pt_BR/fusiondirectory.po b/posix/locale/pt_BR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bad011bc3db4e0eea98e1535e49f3f6160db2915
--- /dev/null
+++ b/posix/locale/pt_BR/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "DiretÃ³rio principal"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "O pacote para o diretÃ³rio principal deste usuÃ¡rio"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Estado"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Conta"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Sistema de confianÃ§a"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Modo de confianÃ§a"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "desabilitado"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Acesso total"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Permitir acesso a esses servidores"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "Permitir apenas que este usuÃ¡rio conecte-se Ã  lista de hosts"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automÃ¡tico"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "senha expirada"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Erro"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Erro de LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "'nextIdHook' nÃ£o estÃ¡ disponÃvel. Utilizando base padrÃ£o."
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "MÃ©todo de alocaÃ§Ã£o de id"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Tradicional"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Pool de id samba unix"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Grupo"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Propriedades"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Nome"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "DescriÃ§Ã£o"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/ru/fusiondirectory.po b/posix/locale/ru/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..ec3d7dabc6ed9c76af2ab84e273b3051615ecba3
--- /dev/null
+++ b/posix/locale/ru/fusiondirectory.po
@@ -0,0 +1,492 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ POSIX Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ð¸Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "ÐŸÑƒÑ‚ÑŒ Ðº Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¼Ñƒ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "ÐžÐ±Ð¾Ð»Ð¾Ñ‡ÐºÐ°"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+"ÐšÐ°ÐºÐ¾Ð¹ ÑˆÐµÐ»Ð» Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ, ÐºÐ¾Ð³Ð´Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð·Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "ÐÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Ð¡Ð¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ unix Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ/Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+"ÐÐ°Ð²ÑÐ·Ð°Ð½Ð½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ "
+"Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr "Id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr "Id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Ð§Ð»ÐµÐ½ÑÑ‚Ð²Ð¾ Ð² Ð³Ñ€ÑƒÐ¿Ð¿Ð°Ñ…"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑÐ¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€Ð²Ð¾Ð¼ Ð²Ñ…Ð¾Ð´Ðµ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+"ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ñ€Ð¸ Ð¿ÐµÑ€Ð²Ð¾Ð¼ Ð²Ñ…Ð¾Ð´Ðµ (Ð½ÑƒÐ¶Ð½Ð¾ ÑƒÐºÐ°Ð·Ð°Ñ‚ÑŒ "
+"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ \"Ð—Ð°Ð´ÐµÑ€Ð¶ÐºÐ° Ð´Ð¾ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ\")"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° Ð¼ÐµÐ¶Ð´Ñƒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÐ¼Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ñ (Ð´Ð½Ð¸)"
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "Ð—Ð°Ð´ÐµÑ€Ð¶ÐºÐ° Ð´Ð¾ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ (Ð´Ð½Ð¸)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"Ð£ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ð°ÑÐ¸Ð»ÑŒÐ½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾ÑÐ»Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð° "
+"Ð´Ð½ÐµÐ¹ (Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Ð”Ð°Ñ‚Ð° Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ÑÑ‚ÐµÑ‡ÐµÑ‚ (Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼ Ñ‡Ñ‚Ð¾ Ð±Ñ‹ "
+"Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "Ð§ÐµÑ€ÐµÐ· ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (Ð´Ð½Ð¸)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Ð¡ÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð°Ñ‚ÑŒ Ð´Ð¾ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð¿Ð¾ÑÐ»Ðµ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ "
+"(Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "Ð—Ð° ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´Ð°Ñ‚ÑŒ Ð¾Ð± Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ð¸ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ (Ð´Ð½Ð¸)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´Ð°Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾Ð± Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ð¸ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ ÐµÐ³Ð¾ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð·Ð° ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ "
+"ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾ Ð´Ð½ÐµÐ¹ (Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ðµ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Ð¢Ð¸Ð¿ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð´Ð»Ñ ÑÑ‚Ð¸Ñ… Ñ…Ð¾ÑÑ‚Ð¾Ð²"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Ð¿Ð¾Ð»Ð½Ñ‹Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð½Ð° ÑÑ‚Ð¸ Ñ…Ð¾ÑÑ‚Ñ‹"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ðº Ñ…Ð¾ÑÑ‚Ð°Ð¼ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "Ð˜ÑÑ‚ÐµÐº"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ð¹"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "ÑÑ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð»Ñ Ð¸ÑÑ‚ÐµÐº"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÐ¼"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s"
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð²Ñ‹Ð´ÐµÐ»Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ñ‹Ð¹ ID:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool Ð½Ðµ ÑƒÐ½Ð¸ÐºÐ°Ð»ÑŒÐ½Ð°!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "Ð½ÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ñ… ID!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "ÐŸÑ€ÐµÐ²Ñ‹ÑˆÐµÐ½Ð¾ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ñ‡Ð¸ÑÐ»Ð¾ Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð¾Ðº!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð²Ñ‹Ð´ÐµÐ»Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ñ‹Ð¹ ID!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ id Ð³Ñ€ÑƒÐ¿Ð¿/Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+"ÐÐ°Ð¸Ð¼ÐµÐ½ÑŒÑˆÐ¸Ð¹ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ "
+"Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ‚ÑŒ Ð´Ñ‹Ñ€Ñ‹ Ð² Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑƒÑ‡ÐµÑ‚Ð½Ð¾Ð¹ "
+"Ð·Ð°Ð¿Ð¸ÑÐ¸ Ñ€Ð°Ð²Ð½Ñ‹Ð¼ 0."
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+"Ð¡ÐºÑ€Ð¸Ð¿Ñ‚, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð±ÑƒÐ´ÐµÑ‚ Ð²Ñ‹Ð·Ð²Ð°Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¸ Ð½Ð°Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ð¸ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ³Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑ€Ð° "
+"id Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸Ð¸Ð» Ð³Ñ€ÑƒÐ¿Ð¿."
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+"ÐžÑ‚ÐºÑƒÐ´Ð° Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ‚ÑŒ ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr "ÐÐ°Ñ‡Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "ÐžÑ‚ÐºÑƒÐ´Ð° Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ‚ÑŒ ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "ÐœÐµÑ‚Ð¾Ð´ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ id"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr "ÐœÐµÑ‚Ð¾Ð´ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð¾Ñ€Ð¾Ð² Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Ð¢Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ð¹"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "ÐŸÑƒÐ» id Ð´Ð»Ñ samba Ð¸ unix"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð² Ð¿ÑƒÐ»Ðµ"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+"ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿ÑƒÐ» Ð¼ÐµÑ‚Ð¾Ð´Ð°"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² Ð¿ÑƒÐ»Ðµ"
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+"ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿ÑƒÐ» Ð¼ÐµÑ‚Ð¾Ð´Ð°"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¿ÑƒÐ»Ðµ"
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿ÑƒÐ» Ð¼ÐµÑ‚Ð¾Ð´Ð°"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð¿ÑƒÐ»Ðµ"
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ id Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹, Ð¿Ñ€Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿ÑƒÐ» Ð¼ÐµÑ‚Ð¾Ð´Ð°"
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ¸"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ POSIX ÑˆÐµÐ»Ð»Ñ‹ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ FD"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð°"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± POSIX Ð³Ñ€ÑƒÐ¿Ð¿Ðµ"
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr "POSIX Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÑŒ GID Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr "Ð£ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ GID Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr "GID Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Ð§Ð»ÐµÐ½Ñ‹ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr "ÐŸÐ¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ ÑÑ‚Ð¾Ð¹ Ð³Ñ€ÑƒÐ¿Ð¿Ðµ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ðº Ñ…Ð¾ÑÑ‚Ð°Ð¼ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°"
diff --git a/posix/locale/ru@petr1708/fusiondirectory.po b/posix/locale/ru@petr1708/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..cea0416d1bca9d0b58fca816008120a58279951d
--- /dev/null
+++ b/posix/locale/ru@petr1708/fusiondirectory.po
@@ -0,0 +1,470 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru@petr1708\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/sv/fusiondirectory.po b/posix/locale/sv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..90a5b07a93f7b700018d65eada019cca08df221a
--- /dev/null
+++ b/posix/locale/sv/fusiondirectory.po
@@ -0,0 +1,479 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr "Unix"
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Redigera anvÃ¤ndarens POSIX-instÃ¤llningar"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "Hemkatalog"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr "SÃ¶kvÃ¤gen till hemkatalogen fÃ¶r den hÃ¤r anvÃ¤ndaren"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Skal"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr "Vilket skal ska anvÃ¤ndas nÃ¤r den hÃ¤r anvÃ¤ndaren loggar in"
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "okonfigurerad"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "PrimÃ¤r grupp"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr "PrimÃ¤r grupp fÃ¶r den hÃ¤r anvÃ¤ndaren"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Status"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr "Status pÃ¥ det hÃ¤r unix-kontot"
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "Gruppmedlemskap"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "Konto"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "AnvÃ¤ndare mÃ¥ste Ã¤ndra lÃ¶senord vid fÃ¶rsta inloggning"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr "FÃ¶rdrÃ¶jning innan tvingande lÃ¶senordsbyte (dagar)"
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+"AnvÃ¤ndaren kommer att tvingas byta lÃ¶senord efter sÃ¥ hÃ¤r mÃ¥nga dagar (lÃ¤mna "
+"tomt fÃ¶r att  avaktivera)"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr "UtgÃ¥ngsdatum fÃ¶r lÃ¶senord"
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+"Datum efter vilket denna anvÃ¤ndares lÃ¶senord kommer att sluta gÃ¤lla (lÃ¤mna "
+"tomt fÃ¶r att avaktivera)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr "Inaktivitet innan avaktivering av anvÃ¤ndare (dagar)"
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+"Maximalt antal inaktiva dagar efter lÃ¶senordets utgÃ¥ng innan anvÃ¤ndaren Ã¤r "
+"avaktiverad (lÃ¤mna tomt fÃ¶r att avaktivera funktionen)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr "FÃ¶rdrÃ¶jning fÃ¶r varning innan lÃ¶senordsbyte (dagar)"
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+"AnvÃ¤ndaren kommer att varnas sÃ¥ hÃ¤r mÃ¥nga dagar innan lÃ¶senordet lÃ¶per ut "
+"(lÃ¤mna tomt fÃ¶r att avaktivera)"
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "System trust"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Trust-lÃ¤ge"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr "Auktoriseringstyp fÃ¶r dessa hosts"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "avaktiverad"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "full tillgÃ¥ng"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "tillÃ¥t dessa hosts tillgÃ¥ng"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr "TillÃ¥t anvÃ¤ndaren att endast logga in pÃ¥ denna lista av hosts"
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "automatisk"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "har utgÃ¥tt"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "grace-tid aktiv"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "aktiv"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "lÃ¶senord har slutat gÃ¤lla"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr "lÃ¶senord kan inte Ã¤ndras"
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Varning"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Fel"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr "Kan inte allokera ett fritt ID:"
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr "%sPoolMin >= %sPoolMax!"
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP-fel"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr "sambaUnixIdPool Ã¤r inte unik!"
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr "inget ID tillgÃ¤ngligt!"
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr "maximalt antal fÃ¶rsÃ¶k Ã¶verskridet!"
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "Kan inte allokera ett fritt ID!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr "'nextIdHook' Ã¤r inte tillgÃ¤nglig. AnvÃ¤nder standard-bas!"
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr "NÃ¤sta id-hook"
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr "Var man ska bÃ¶rja kolla efter nya fria anvÃ¤ndar-IDn."
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr "Var man ska bÃ¶rja kolla efter nya fria grupp-IDn."
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr "Id-allokeringsmetod"
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr "Traditionell"
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr "Samba unix id pool"
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr "TillgÃ¤ngliga skal"
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr "TillgÃ¤ngliga POSIX-skal fÃ¶r FD-anvÃ¤ndare"
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "Grupp"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "Namn"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "Beskrivning"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Tvinga GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "Gruppmedlemmar"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/ug/fusiondirectory.po b/posix/locale/ug/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..701eeb36764d7cfe8f70cb1d0b6eac86589724a4
--- /dev/null
+++ b/posix/locale/ug/fusiondirectory.po
@@ -0,0 +1,470 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/vi_VN/fusiondirectory.po b/posix/locale/vi_VN/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..0ad75fabfdbc627a878d00ed105e06f522ac6e58
--- /dev/null
+++ b/posix/locale/vi_VN/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi_VN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr "Hiá»‡u chá»‰nh cÃ i Ä‘áº·t POSIX cá»§a ngÆ°á»i dÃ¹ng"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "ThÆ° má»¥c chá»§"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "khÃ´ng Ä‘Æ°á»£c cáº¥u hÃ¬nh"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "NhÃ³m sÆ¡ cáº¥p"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "Tráº¡ng thÃ¡i"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "TÆ° cÃ¡ch thÃ nh viÃªn nhÃ³m"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "TÃ i khoáº£n"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "NgÆ°á»i dÃ¹ng pháº£i thay Ä‘á»•i máºt kháº©u ngay láº§n Ä‘Äƒng nháºp Ä‘áº§u tiÃªn"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "á»¦y thÃ¡c há»‡ thá»‘ng"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "Cháº¿ Ä‘á»™ á»§y thÃ¡c"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "ÄÃ£ vÃ´ hiá»‡u"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "Truy cáºp hoÃ n toÃ n"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "Cho phÃ©p truy cáºp Ä‘áº¿n cÃ¡c mÃ¡y chá»§ nÃ y"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "tá»± Ä‘á»™ng"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "háº¿t háº¡n"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "Thá»i gian trÆ°á»›c khi tÃ i khoáº£n bá»‹ khÃ³a Ä‘ang hoáº¡t Ä‘á»™ng"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "hoáº¡t Ä‘á»™ng"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr "máºt kháº©u háº¿t háº¡n"
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "Sá»‘ ID cá»§a ngÆ°á»i sá» dá»¥ng"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "Sá»‘ ID cá»§a nhÃ³m"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "Cáº£nh bÃ¡o"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "Lá»—i"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "Lá»—i LDAP"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr "KhÃ´ng thá»ƒ phÃ¢n phá»‘i má»™t ID miá»…n phÃ!"
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "NhÃ³m "
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "Properties"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "TÃªn"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "MÃ´ táº£"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "Ãp dá»¥ng GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "CÃ¡c thÃ nh viÃªn nhÃ³m"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/locale/zh/fusiondirectory.po b/posix/locale/zh/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..cd1e687be2fdc7edd8271acef8f500a5c2e43023
--- /dev/null
+++ b/posix/locale/zh/fusiondirectory.po
@@ -0,0 +1,471 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/posix/class_posixAccount.inc:86
+#: personal/posix/class_posixAccount.inc:115
+msgid "Unix"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:87
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "Home directory"
+msgstr "ç”¨æˆ·ä¸»ç›®å½•"
+
+#: personal/posix/class_posixAccount.inc:119
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Shell"
+msgstr "Shell"
+
+#: personal/posix/class_posixAccount.inc:124
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:126
+msgid "unconfigured"
+msgstr "æœªé…ç½®"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group"
+msgstr "ä¸»è¦ç”¨æˆ·ç»„"
+
+#: personal/posix/class_posixAccount.inc:130
+msgid "Primary group for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status"
+msgstr "çŠ¶æ€"
+
+#: personal/posix/class_posixAccount.inc:134
+msgid "Status of this user unix account"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user/group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:138
+msgid "Force user id and group id values for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:142
+msgid "User id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:147
+msgid "Group id value for this user"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:154
+#: personal/posix/class_posixAccount.inc:157
+msgid "Group membership"
+msgstr "ç»„æˆå‘˜èº«ä»½"
+
+#: personal/posix/class_posixAccount.inc:161
+msgid "Account"
+msgstr "è´¦æˆ·"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid "User must change password on first login"
+msgstr "ç”¨æˆ·å¿…é¡»åœ¨ç¬¬ä¸€æ¬¡ç™»å½•ä¿®æ”¹å£ä»¤"
+
+#: personal/posix/class_posixAccount.inc:165
+msgid ""
+"User must change password on first login (needs a value for Delay before "
+"forcing password change)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid "Minimum delay between password changes (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:169
+msgid ""
+"The user won't be able to change his password before this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:174
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid "Password expiration date"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:179
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:184
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:189
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:201
+#: admin/groups/posix/class_posixGroup.inc:91
+msgid "System trust"
+msgstr "ä¿¡èµ–çš„ç³»ç»Ÿ"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Trust mode"
+msgstr "ä¿¡èµ–æ¨¡å¼"
+
+#: personal/posix/class_posixAccount.inc:205
+#: admin/groups/posix/class_posixGroup.inc:95
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "disabled"
+msgstr "ç¦ç”¨"
+
+#: personal/posix/class_posixAccount.inc:209
+#: personal/posix/class_posixAccount.inc:231
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "full access"
+msgstr "å®Œå…¨è®¿é—®æƒé™"
+
+#: personal/posix/class_posixAccount.inc:209
+#: admin/groups/posix/class_posixGroup.inc:99
+msgid "allow access to these hosts"
+msgstr "å…è®¸è®¿é—®è¿™äº›ä¸»æœº"
+
+#: personal/posix/class_posixAccount.inc:212
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:298
+msgid "automatic"
+msgstr "è‡ªåŠ¨"
+
+#: personal/posix/class_posixAccount.inc:317
+msgid "expired"
+msgstr "è¿‡æœŸ"
+
+#: personal/posix/class_posixAccount.inc:319
+msgid "grace time active"
+msgstr "æ—¶é—´é™åˆ¶æ¿€æ´»"
+
+#: personal/posix/class_posixAccount.inc:322
+#: personal/posix/class_posixAccount.inc:324
+#: personal/posix/class_posixAccount.inc:326
+msgid "active"
+msgstr "æ´»åŠ¨"
+
+#: personal/posix/class_posixAccount.inc:322
+msgid "password expired"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:324
+msgid "password not changeable"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:423
+msgid "UID"
+msgstr "UID"
+
+#: personal/posix/class_posixAccount.inc:426
+#: admin/groups/posix/class_posixGroup.inc:74
+#: admin/groups/posix/class_posixGroup.inc:150
+msgid "GID"
+msgstr "GID"
+
+#: personal/posix/class_posixAccount.inc:534
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:756
+#: personal/posix/class_posixAccount.inc:777
+#: personal/posix/class_posixAccount.inc:971
+msgid "Warning"
+msgstr "è¦å‘Š"
+
+#: personal/posix/class_posixAccount.inc:756
+#, php-format
+msgid "Unknown ID allocation method \"%s\"!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:778
+#, php-format
+msgid "Timeout while waiting for lock. Ignoring lock from %s!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+#: personal/posix/class_posixAccount.inc:939
+msgid "Error"
+msgstr "é”™è¯¯"
+
+#: personal/posix/class_posixAccount.inc:805
+#: personal/posix/class_posixAccount.inc:845
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+#: personal/posix/class_posixAccount.inc:868
+#: personal/posix/class_posixAccount.inc:877
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:805
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:837
+msgid "LDAP error"
+msgstr "LDAP é”™è¯¯"
+
+#: personal/posix/class_posixAccount.inc:845
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:857
+#: personal/posix/class_posixAccount.inc:861
+msgid "no ID available!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:877
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:939
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: personal/posix/class_posixAccount.inc:971
+msgid "'nextIdHook' is not available. Using default base!"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:28
+msgid "POSIX configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:29
+msgid "FusionDirectory POSIX plugin configuration"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:42
+msgid "Posix"
+msgstr "Posix"
+
+#: config/posix/class_posixConfig.inc:46
+msgid "Group/user min id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:47
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with id 0 "
+"accounts."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid "Next id hook"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:52
+msgid ""
+"A script to be called for finding the next free id number for users or "
+"groups."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:56
+msgid "Base number for user id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:57
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:62
+msgid "Base number for group id"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:63
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Id allocation method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:68
+msgid "Method to allocate user/group ids"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Traditional"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:71
+msgid "Samba unix id pool"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Pool user id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:74
+msgid "Minimum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Pool user id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:79
+msgid "Maximum value for user id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Pool group id min"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:84
+msgid "Minimum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Pool group id max"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:89
+msgid "Maximum value for group id when using pool method"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:96
+msgid "Shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available shells"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:100
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Default shell"
+msgstr ""
+
+#: config/posix/class_posixConfig.inc:107
+msgid "Shell used by default when activating Unix tab."
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:34
+msgid "Group"
+msgstr "ç»„"
+
+#: admin/groups/posix/class_posixGroup.inc:35
+msgid "POSIX group information"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:38
+msgid "POSIX group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:39
+msgid "POSIX user group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:57
+msgid "Properties"
+msgstr "å±žæ€§"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name"
+msgstr "åç§°"
+
+#: admin/groups/posix/class_posixGroup.inc:61
+msgid "Name of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Description"
+msgstr "æè¿°"
+
+#: admin/groups/posix/class_posixGroup.inc:66
+msgid "Short description of this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID"
+msgstr "å¼ºåˆ¶ GID"
+
+#: admin/groups/posix/class_posixGroup.inc:70
+msgid "Force GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:74
+msgid "GID value for this group"
+msgstr ""
+
+#: admin/groups/posix/class_posixGroup.inc:81
+#: admin/groups/posix/class_posixGroup.inc:84
+msgid "Group members"
+msgstr "ç»„æˆå‘˜"
+
+#: admin/groups/posix/class_posixGroup.inc:102
+msgid "Only allow this group to connect to this list of hosts"
+msgstr ""
diff --git a/posix/personal/posix/class_posixAccount.inc b/posix/personal/posix/class_posixAccount.inc
new file mode 100644
index 0000000000000000000000000000000000000000..d17ae8ad52a082455d9174f4a4681581c60474a6
--- /dev/null
+++ b/posix/personal/posix/class_posixAccount.inc
@@ -0,0 +1,975 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2003  Cajus Pollmeier
+  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.
+*/
+
+/*!
+  \brief   posixAccount plugin
+  \author  Cajus Pollmeier <pollmeier@gonicus.de>
+  \version 2.00
+  \date    24.07.2003
+
+  This class provides the functionality to read and write all attributes
+  relevant for posixAccounts and shadowAccounts from/to the LDAP. It
+  does syntax checking and displays the formulars required.
+ */
+
+class EpochDaysDateAttribute extends DateAttribute
+{
+  /* 24 * 60 * 60 = 86400 */
+  public static $secondsPerDay = 86400;
+
+  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = "")
+  {
+    parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $acl);
+  }
+
+  protected function ldapToDate($ldapValue)
+  {
+    $date = DateTime::createFromFormat('U', $ldapValue * static::$secondsPerDay, timezone::utc());
+    if ($date !== FALSE) {
+      return $date;
+    } else {
+      trigger_error('LDAP value for '.$this->getLdapName().' was not in the right date format.');
+      return new DateTime($ldapValue, timezone::utc());
+    }
+  }
+
+  protected function dateToLdap($dateValue)
+  {
+    return floor($dateValue->format('U') / static::$secondsPerDay);
+  }
+
+  function getEpochDays()
+  {
+    if (empty($this->value)) {
+      return 0;
+    } else {
+      try {
+        return $this->dateToLdap($this->getDateValue());
+      } catch (Exception $e) {
+        if (is_object($this->plugin) && $this->plugin->is_template) {
+          return $this->value;
+        } else {
+          throw $e;
+        }
+      }
+    }
+  }
+}
+
+class posixAccount extends simplePlugin
+{
+  var $displayHeader = TRUE;
+  var $objectclasses = array('posixAccount', 'shadowAccount');
+  protected $locks = array();
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('Unix'),
+      'plDescription' => _('Edit users POSIX settings'),
+      'plIcon'        => 'geticon.php?context=applications&icon=os-linux&size=48',
+      'plSmallIcon'   => 'geticon.php?context=applications&icon=os-linux&size=16',
+      'plSelfModify'  => TRUE,
+      'plPriority'    => 2,
+      'plObjectType'  => array('user'),
+      'plForeignKeys' => array(
+        'gidNumber' => array(
+          array('group','gidNumber'),
+          array('mixedGroup','gidNumber'),
+        ),
+        'host'      => array(
+          array('serverGeneric', 'cn'),
+          array('workstationGeneric', 'cn'),
+          array('terminalGeneric', 'cn'),
+        )
+      ),
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  // The main function : information about attributes
+  static function getAttributesInfo ()
+  {
+    global $config;
+    return array(
+      'main' => array(
+        'name'  => _('Unix'),
+        'icon'  => 'geticon.php?context=applications&icon=os-linux&size=16',
+        'attrs' => array(
+          new PathAttribute(
+            _('Home directory'), _('The path to the home directory of this user'),
+            'homeDirectory', TRUE
+          ),
+          new StringAttribute('gecos', 'gecos', 'gecos'),
+          new SelectAttribute(
+            _('Shell'), _('Which shell should be used when this user log in'),
+            'loginShell', TRUE,
+            $config->get_cfg_value('Shells', array(_('unconfigured'))),
+            $config->get_cfg_value('DefaultShell', '')
+          ),
+          new SelectAttribute(
+            _('Primary group'), _('Primary group for this user'),
+            'primaryGroup', FALSE
+          ),
+          new DisplayAttribute(
+            _('Status'), _('Status of this user unix account'),
+            'posixStatus', FALSE
+          ),
+          new BooleanAttribute(
+            _('Force user/group id'), _('Force user id and group id values for this user'),
+            'force_ids', FALSE
+          ),
+          new IntAttribute(
+            _('User id'), _('User id value for this user'),
+            'uidNumber', FALSE,
+            0, FALSE, ''
+          ),
+          new IntAttribute(
+            _('Group id'), _('Group id value for this user'),
+            'gidNumber', FALSE,
+            0, FALSE, ''
+          )
+        )
+      ),
+      'groups' => array(
+        'name'  => _('Group membership'),
+        'icon'  => 'geticon.php?context=types&icon=user-group&size=16',
+        'attrs' => array(
+          new GroupsAttribute('', _('Group membership'), 'groupMembership')
+        )
+      ),
+      'account' => array(
+        'name'  => _('Account'),
+        'icon'  => 'geticon.php?context=devices&icon=terminal&size=16',
+        'attrs' => array(
+          new BooleanAttribute(
+            _('User must change password on first login'), _('User must change password on first login (needs a value for Delay before forcing password change)'),
+            'mustchangepassword', FALSE
+          ),
+          new IntAttribute(
+            _('Minimum delay between password changes (days)'), _('The user won\'t be able to change his password before this number of days (leave empty to disable)'),
+            'shadowMin', FALSE,
+            0, FALSE, ''
+          ),
+          new IntAttribute(
+            _('Delay before forcing password change (days)'), _('The user will be forced to change his password after this number of days (leave empty to disable)'),
+            'shadowMax', FALSE,
+            0, FALSE, ''
+          ),
+          new EpochDaysDateAttribute(
+            _('Password expiration date'), _('Date after which this user password will expire (leave empty to disable)'),
+            'shadowExpire', FALSE,
+            ''
+          ),
+          new IntAttribute(
+            _('Delay of inactivity before disabling user (days)'), _('Maximum delay of inactivity after password expiration before the user is disabled (leave empty to disable)'),
+            'shadowInactive', FALSE,
+            0, FALSE, ''
+          ),
+          new IntAttribute(
+            _('Delay for user warning before password expiry (days)'), _('The user will be warned this number of days before his password expiration (leave empty to disable)'),
+            'shadowWarning', FALSE,
+            0, FALSE, ''
+          ),
+          new IntAttribute(
+            'No label', 'No description',
+            'shadowLastChange', FALSE,
+            0, FALSE, ''
+          ),
+        )
+      ),
+      'system_trust' => array(
+        'name'  => _('System trust'),
+        'icon'  => 'geticon.php?context=categories&icon=acl&size=16',
+        'attrs' => array(
+          new SelectAttribute(
+            _('Trust mode'), _('Type of authorization for those hosts'),
+            'trustMode', FALSE,
+            array('', 'fullaccess', 'byhost'),
+            '',
+            array(_('disabled'), _('full access'), _('allow access to these hosts'))
+          ),
+          new SystemsAttribute(
+            '', _('Only allow this user to connect to this list of hosts'),
+            'host', FALSE
+          )
+        )
+      )
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    global $config;
+    parent::__construct($dn, $object, $parent, $mainTab);
+
+    $this->attributesAccess['gecos']->setVisible(FALSE);
+
+    $this->attributesAccess['trustMode']->setInLdap(FALSE);
+    if (!class_available('systemManagement')) {
+      $this->attributesAccess['trustMode']->setChoices(
+            array('', 'fullaccess'),
+            array(_('disabled'), _('full access'))
+      );
+    }
+    $this->attributesAccess['trustMode']->setManagedAttributes(
+      array(
+        'multiplevalues' => array('notbyhost' => array('','fullaccess')),
+        'erase' => array(
+          'notbyhost' => array('host')
+        )
+      )
+    );
+    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
+      $this->trustMode = 'fullaccess';
+    } elseif (count($this->host) > 0) {
+      $this->trustMode = 'byhost';
+    }
+
+    $this->attributesAccess['uidNumber']->setUnique(TRUE);
+    $this->attributesAccess['force_ids']->setInLdap(FALSE);
+    $this->attributesAccess['force_ids']->setManagedAttributes(
+      array(
+        'disable' => array (
+          FALSE => array (
+            'uidNumber',
+            'gidNumber',
+          )
+        )
+      )
+    );
+    $this->attributesAccess['primaryGroup']->setInLdap(FALSE);
+
+    $this->attributesAccess['mustchangepassword']->setInLdap(FALSE);
+    $this->attributesAccess['shadowLastChange']->setVisible(FALSE);
+    $this->attributesAccess['shadowMax']->setManagedAttributes(
+      array(
+        'disable' => array (
+          '' => array (
+            'mustchangepassword',
+          )
+        )
+      )
+    );
+
+    if ($dn !== NULL) {
+      /* Correct is_account. shadowAccount is not required. */
+      if (isset($this->attrs['objectClass']) &&
+          in_array ('posixAccount', $this->attrs['objectClass'])) {
+        $this->is_account = TRUE;
+      }
+
+      $this->initially_was_account = $this->is_account;
+
+      /* Fill group */
+      $this->primaryGroup = $this->gidNumber;
+    }
+
+    /* Generate shell list from config */
+    $loginShellList = $this->attributesAccess['loginShell']->getChoices();
+
+    /* Insert possibly missing loginShell */
+    $loginShell = $this->attributesAccess['loginShell']->getValue();
+    if (($loginShell != '') && !in_array($loginShell, $loginShellList)) {
+      $loginShellList[] = $loginShell;
+    }
+    $this->attributesAccess['loginShell']->setChoices($loginShellList);
+
+    $secondaryGroups = array();
+    $secondaryGroups[''] = "- "._("automatic")." -";
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search("(objectClass=posixGroup)", array("cn", "gidNumber"));
+    while ($attrs = $ldap->fetch()) {
+      $secondaryGroups[$attrs['gidNumber'][0]] = $attrs['cn'][0];
+    }
+    asort ($secondaryGroups);
+    $this->attributesAccess['primaryGroup']->setChoices(array_keys($secondaryGroups), array_values($secondaryGroups));
+
+    if (!$this->is_template) {
+      $current = floor(date("U") / EpochDaysDateAttribute::$secondsPerDay);
+
+      $shadowExpire     = $this->attributesAccess['shadowExpire']->getEpochDays();
+      $shadowInactive   = $this->attributesAccess['shadowInactive']->getValue();
+      $shadowMin        = $this->attributesAccess['shadowMin']->getValue();
+      $shadowMax        = $this->attributesAccess['shadowMax']->getValue();
+      $shadowLastChange = $this->attributesAccess['shadowLastChange']->getValue();
+      if (($current >= $shadowExpire) && ($shadowExpire > 0)) {
+        $status = _("expired");
+        if ($shadowInactive != "" && ($current - $shadowExpire) < $shadowInactive) {
+          $status .= ", "._("grace time active");
+        }
+      } elseif ($shadowMax != "" && ($shadowLastChange + $shadowMax) <= $current) {
+        $status = _("active").", "._("password expired");
+      } elseif ($shadowMin != "" && ($shadowLastChange + $shadowMin) <= $current) {
+        $status = _("active").", "._("password not changeable");
+      } else {
+        $status = _("active");
+      }
+      $this->attributesAccess['posixStatus']->setValue($status);
+    }
+
+    $this->attributesAccess['groupMembership']->setInLdap(FALSE);
+    if (class_available('mixedGroup')) {
+      $this->attributesAccess['groupMembership']->setDisabled(TRUE);
+      $this->attributesAccess['groupMembership']->setVisible(FALSE);
+    } else {
+      if ($this->is_template) {
+        if (isset($this->attrs['posixGroups'])) {
+          unset($this->attrs['posixGroups']['count']);
+          $this->groupMembership = $this->attrs['posixGroups'];
+        }
+      } else {
+        /* Groups handling */
+        $ldap->cd($config->current['BASE']);
+        $ldap->search('(&(objectClass=posixGroup)(memberUid='.ldap_escape_f($this->getUid()).'))', array('cn', 'description'));
+        $groupMembership = array();
+        while ($attrs = $ldap->fetch()) {
+          if (!isset($attrs['description'][0])) {
+            $entry = $attrs['cn'][0];
+          } else {
+            $entry = $attrs['cn'][0].' ['.$attrs['description'][0].']';
+          }
+          $groupMembership[$attrs['dn']] = $entry;
+        }
+        asort($groupMembership);
+        reset($groupMembership);
+        $this->attributesAccess['groupMembership']->setValue(array_keys($groupMembership));
+        $this->attributesAccess['groupMembership']->setDisplayValues(array_values($groupMembership));
+        $this->savedGroupMembership = array_keys($groupMembership);
+      }
+    }
+    if ($this->is_template) {
+      if (isset($this->attrs['force_ids'])) {
+        $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
+      }
+      if (!$this->force_ids) {
+        $this->uidNumber = '';
+        $this->gidNumber = '';
+      }
+      if (isset($this->attrs['mustchangepassword'])) {
+        $this->mustchangepassword = ($this->attrs['mustchangepassword'][0] != 'FALSE');
+      }
+    }
+  }
+
+  function getUid()
+  {
+    if (isset($this->parent)) {
+      $baseobject = $this->parent->getBaseObject();
+      return $baseobject->uid;
+    }
+    if (isset($this->attrs['uid'][0])) {
+      return $this->attrs['uid'][0];
+    }
+  }
+
+  function resetCopyInfos()
+  {
+    global $config;
+    parent::resetCopyInfos();
+
+    $this->savedGroupMembership = array();
+
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).')(cn='.ldap_escape_f($this->getUid()).'))', array('cn','gidNumber'));
+
+    if ($ldap->count() > 0) {
+      /* The copied user had its own group: switch back to automatic */
+      $this->primaryGroup = 0;
+    }
+
+    $this->force_ids = FALSE;
+    $this->attributesAccess['uidNumber']->setInitialValue('');
+    $this->attributesAccess['gidNumber']->setInitialValue('');
+    $this->uidNumber = '';
+    $this->gidNumber = '';
+  }
+
+  function check()
+  {
+    global $config;
+    if (isset($this->parent) &&
+        isset($this->parent->getBaseObject()->is_template) &&
+        $this->parent->getBaseObject()->is_template) {
+      $message = array();
+    } else {
+      $message = parent::check();
+    }
+
+    /* Check ID's if they are forced by user */
+    if ($this->force_ids) {
+      if ($this->uidNumber < $config->get_cfg_value("minId")) {
+        $message[] = msgPool::toosmall(_("UID"), $config->get_cfg_value("minId"));
+      }
+      if ($this->gidNumber < $config->get_cfg_value("minId")) {
+        $message[] = msgPool::toosmall(_("GID"), $config->get_cfg_value("minId"));
+      }
+    }
+
+    /* Check shadow settings */
+    if ($this->shadowWarning !== "") {
+      if ($this->shadowMax === "") {
+        $message[] = msgPool::depends("shadowWarning", "shadowMax");
+      }
+      if ($this->shadowWarning > $this->shadowMax) {
+        $message[] = msgPool::toobig("shadowWarning", "shadowMax");
+      }
+      if (($this->shadowMin !== "") && ($this->shadowWarning < $this->shadowMin)) {
+        $message[] = msgPool::toosmall("shadowWarning", "shadowMin");
+      }
+    }
+
+    if (($this->shadowInactive !== "") && ($this->shadowMax === "")) {
+      $message[] = msgPool::depends("shadowInactive", "shadowMax");
+    }
+    if (($this->shadowMin !== "") && ($this->shadowMax !== "") &&
+        ($this->shadowMin > $this->shadowMax)) {
+      $message[] = msgPool::toobig("shadowMin", "shadowMax");
+    }
+
+    return $message;
+  }
+
+  function prepare_save()
+  {
+    global $config;
+    /* Fill gecos */
+    if (isset($this->parent) && $this->parent !== NULL) {
+      $this->gecos = rewrite($this->parent->getBaseObject()->cn);
+      if (!preg_match('/^[a-z0-9 -]+$/i', $this->gecos)) {
+        $this->gecos = "";
+      }
+    }
+
+    if (!$this->force_ids) {
+      /* Handle uidNumber.
+       * - use existing number if possible
+       * - if not, try to create a new uniqe one.
+       * */
+      if ($this->is_template) {
+        $this->uidNumber = '';
+      } else {
+        if ($this->attributesAccess['uidNumber']->getInitialValue() != '') {
+          $this->uidNumber = $this->attributesAccess['uidNumber']->getInitialValue();
+        } else {
+          $this->uidNumber = static::getNextIdLock('uidNumber', $this->dn);
+          $this->locks[] = 'uidNumber';
+        }
+      }
+    }
+
+    /* Handle gidNumber
+     * - If we do not have a primary group selected (automatic), we will check if there
+     *    is already a group  with the same name and use this as primary.
+     * - .. if we couldn't find a group with the same name, we will create a new one,
+     *    using the users uid as cn and a generated uniqe gidNumber.
+     * */
+    if ($this->is_template && $this->force_ids) {
+      /* Nothing to do in this case */
+    } elseif ($this->is_template && ($this->primaryGroup == 0)) {
+      $this->gidNumber = '';
+    } elseif (($this->primaryGroup == 0) || $this->force_ids) {
+      /* Search for existing group */
+      $ldap = $config->get_ldap_link();
+      $ldap->cd($config->current['BASE']);
+
+      /* Are we forced to use a special gidNumber? */
+      if ($this->force_ids) {
+        $ldap->search('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).'))',      array('cn','gidNumber'));
+      } else {
+        $ldap->search('(&(objectClass=posixGroup)(gidNumber=*)(cn='.ldap_escape_f($this->getUid()).'))', array('cn','gidNumber'));
+      }
+
+      /* No primary group found, create a new one */
+      if ($ldap->count() == 0) {
+        $groupcn  = $this->getUid();
+
+        /* Request a new and unique gidNumber, if required */
+        if (!$this->force_ids) {
+          $this->gidNumber = static::getNextIdLock('gidNumber', $this->dn);
+          $this->locks[] = 'gidNumber';
+        }
+
+        /* If forced gidNumber could not be found, then check if the given group name already exists.
+         */
+        $cnt = 0;
+        $ldap->search('(&(objectClass=posixGroup)(cn='.ldap_escape_f($groupcn).'))', array('cn'));
+        while ($ldap->count() && ($cnt < 100)) {
+          $cnt++;
+          $groupcn = $this->getUid().'_'.$cnt;
+          $ldap->search('(&(objectClass=posixGroup)(cn='.ldap_escape_f($groupcn).'))', array('cn'));
+        }
+
+        /* Create new primary group and enforce the new gidNumber */
+        if (class_available('mixedGroup')) {
+          $tabObject = objects::create('ogroup');
+        } else {
+          $tabObject  = objects::create('group');
+        }
+
+        $baseObject = $tabObject->getBaseObject();
+
+        $baseObject->cn           = $groupcn;
+        $baseObject->description  = sprintf(_('Group of user %s'), $this->getUid());
+        if (class_available('mixedGroup')) {
+          // fake attrs as this user may not exists yet
+          $attrs = array(
+            'objectClass' => array('inetOrgPerson','organizationalPerson','person','posixAccount','shadowAccount'),
+            'cn' => $this->getUid(),
+            'uid' => $this->getUid(),
+          );
+          $baseObject->attributesAccess['member']->addValue($this->dn, $attrs);
+          $tabObject->gen_tabs();
+          $posixTab = $tabObject->by_object['mixedGroup'];
+        } else {
+          $posixTab = $baseObject;
+        }
+        $posixTab->force_id   = 1;
+        $posixTab->gidNumber  = $this->gidNumber;
+
+        $tabObject->save();
+        $groupdn = $tabObject->dn;
+
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
+          sprintf('Primary group "%s" created, using gidNumber "%s".', $groupdn, $this->gidNumber), '');
+      } else {
+        $attrs = $ldap->fetch();
+        $this->gidNumber = $attrs['gidNumber'][0];
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
+          "Found and used: <i>".$attrs['dn']."</i>",
+          sprintf("Primary group '%s' exists, gidNumber is '%s'.", $this->getUid(), $this->gidNumber));
+      }
+    } else {
+      /* Primary group was selected by user */
+      $this->gidNumber = $this->primaryGroup;
+      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
+        sprintf("Primary group '%s' for user '%s' manually selected.",
+        $this->gidNumber, $this->getUid()), "");
+    }
+
+    if (!$this->is_template) {
+      if ($this->mustchangepassword) {
+        $this->shadowLastChange =
+          floor(date('U') / EpochDaysDateAttribute::$secondsPerDay) - $this->shadowMax - 1;
+      } elseif (
+          ($this->is_account && !$this->initially_was_account) ||
+          $this->parent->getBaseObject()->attributesAccess['userPassword']->hasChanged()
+        ) {
+        $this->shadowLastChange = floor(date('U') / EpochDaysDateAttribute::$secondsPerDay);
+      }
+    }
+
+    parent::prepare_save();
+
+    if ($this->trustMode == 'fullaccess') {
+      $this->attrs['host'] = array('*');
+    }
+
+    /* Trust accounts */
+    if (($this->trustMode != "") && !in_array('hostObject', $this->attrs['objectClass'])) {
+      $this->attrs['objectClass'][] = 'hostObject';
+    } elseif (($this->trustMode == "") && (($key = array_search('hostObject', $this->attrs['objectClass'])) !== FALSE)) {
+      unset($this->attrs['objectClass'][$key]);
+    }
+
+    if ($this->is_template) {
+      $this->attrs['posixGroups'] = $this->groupMembership;
+      if ($this->force_ids) {
+        if (($this->uidNumber == '%askme%') ||($this->gidNumber == '%askme%')) {
+          $this->attrs['force_ids'] = '%askme%';
+        } else {
+          $this->attrs['force_ids'] = 'TRUE';
+        }
+      } else {
+        $this->attrs['force_ids']   = 'FALSE';
+      }
+      $this->attrs['mustchangepassword'] = ($this->mustchangepassword ? 'TRUE' : 'FALSE');
+    }
+  }
+
+  function save()
+  {
+    $errors = parent::save();
+
+    foreach ($this->locks as $lock) {
+      del_lock($lock);
+    }
+    $this->locks = array();
+
+    return $errors;
+  }
+
+  function ldap_save()
+  {
+    $errors = parent::ldap_save();
+
+    if (!empty($errors)) {
+      return $errors;
+    }
+
+    if (!$this->is_template && !class_available('mixedGroup')) {
+      /* Take care about groupMembership values: add to groups */
+      $groupMembership = $this->attributesAccess['groupMembership']->getValue();
+      foreach ($groupMembership as $value) {
+        if (!in_array($value, $this->savedGroupMembership)) {
+          $g = objects::open($value, 'group');
+          $g->getBaseObject()->addUser($this->dn, $this->getUid());
+          $msg = $g->save();
+          if (empty($msg)) {
+            $this->savedGroupMembership[] = $value;
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
+        }
+      }
+
+      /* Remove groups not listed in groupMembership */
+      foreach ($this->savedGroupMembership as $key => $value) {
+        if (!in_array($value, $groupMembership)) {
+          $g = objects::open($value, 'group');
+          $g->getBaseObject()->removeUser($this->getUid());
+          $msg = $g->save();
+          if (empty($msg)) {
+            unset($this->savedGroupMembership[$key]);
+          } else {
+            $errors = array_merge($errors, $msg);
+          }
+        }
+      }
+    }
+
+    return $errors;
+  }
+
+  /* remove object from parent */
+  function remove_from_parent()
+  {
+    global $config;
+    /* Cancel if there's nothing to do here */
+    if ((!$this->initially_was_account) || (!$this->acl_is_removeable())) {
+      return;
+    }
+
+    /* Remove and write to LDAP */
+    $errors = parent::remove_from_parent();
+    if (!empty($errors)) {
+      return $errors;
+    }
+
+    /* Delete group only if cn is uid and there are no other members inside */
+    $ldap = $config->get_ldap_link();
+    $ldap->cd ($config->current['BASE']);
+    $ldap->search ('(&(objectClass=posixGroup)(gidNumber='.ldap_escape_f($this->gidNumber).')(cn='.ldap_escape_f($this->getUid()).'))', array('cn', 'memberUid'));
+    if ($ldap->count() != 0) {
+      $attrs = $ldap->fetch();
+      if ($attrs['cn'][0] == $this->getUid() && !isset($this->attrs['memberUid'])) {
+        $ldap->rmDir($attrs['dn']);
+      }
+    }
+  }
+
+  /* Adapt from template, using 'dn' */
+  function adapt_from_template($attrs, $skip = array())
+  {
+    /* Include global link_info */
+
+    parent::adapt_from_template($attrs, $skip);
+
+    $this->savedGroupMembership = $this->groupMembership;
+    if (isset($this->attrs['posixGroups'])) {
+      unset($this->attrs['posixGroups']['count']);
+      $this->groupMembership = $this->attrs['posixGroups'];
+    }
+
+    if (isset($this->attrs['force_ids'])) {
+      $this->force_ids = ($this->attrs['force_ids'][0] != 'FALSE');
+    }
+
+    if (isset($this->attrs['mustchangepassword'])) {
+      $this->mustchangepassword = ($this->attrs['mustchangepassword'][0] != 'FALSE');
+    }
+
+    $this->primaryGroup = $this->gidNumber;
+
+    if ((count($this->host) == 1) && ($this->host[0] == '*')) {
+      $this->trustMode = 'fullaccess';
+    } elseif (count($this->host) > 0) {
+      $this->trustMode = 'byhost';
+    }
+  }
+
+  function foreignKeyUpdate ($field, $oldvalue, $newvalue, $source)
+  {
+    $ret = parent::foreignKeyUpdate($field, $oldvalue, $newvalue, $source);
+    if ($field == 'gidNumber') {
+      if ($newvalue === NULL) {
+        $this->primaryGroup = 0;
+      } else {
+        $this->primaryGroup = $this->gidNumber;
+      }
+    }
+    return $ret;
+  }
+
+  /*!
+   * \brief Get next id
+   *
+   * \param string $attrib attribute to use to find the next id.
+   *
+   * \param String $dn Dn we want an id for.
+   *
+   * \return Return the next id or NULL if failed
+   */
+  static function getNextId($attrib, $dn)
+  {
+    global $config;
+
+    if ($config->get_cfg_value('nextIdHook') != '') {
+      return static::getNextIdHook($attrib, $dn);
+    }
+
+    switch ($config->get_cfg_value('idAllocationMethod', 'traditional')) {
+      case 'pool':
+        return static::getNextIdPool($attrib);
+      default:
+        msg_dialog::display(_('Warning'), sprintf(_('Unknown ID allocation method "%s"!'), $config->get_cfg_value('idAllocationMethod', 'traditional')), WARNING_DIALOG);
+      case 'traditional':
+        return static::getNextIdTraditional($attrib);
+    }
+  }
+
+  /*!
+   * \brief Get next id and add a lock to prevent other user to use it before us
+   */
+  static function getNextIdLock($attrib, $dn)
+  {
+    /* Calculate new id's. We need to place a lock before calling getNextId
+       to get real unique values.
+     */
+    $wait = 10;
+    while ($user = get_lock($attrib)) {
+      sleep (1);
+
+      /* Oups - timed out */
+      if ($wait-- == 0) {
+        msg_dialog::display(
+          _('Warning'),
+          sprintf(_('Timeout while waiting for lock. Ignoring lock from %s!'), $user),
+          WARNING_DIALOG
+        );
+        break;
+      }
+    }
+    add_lock($attrib, $dn);
+    return static::getNextId($attrib, $dn);
+  }
+
+  /*!
+   * \brief Get next id from the sambaUnixIdPool
+   *
+   * \param string $attrib attribute to use to find the next id.
+   *
+   * \return Return the next id or NULL if failed
+   */
+  protected static function getNextIdPool($attrib)
+  {
+    global $config;
+
+    /* Fill informational values */
+    $min = $config->get_cfg_value("${attrib}PoolMin", 10000);
+    $max = $config->get_cfg_value("${attrib}PoolMax", 40000);
+
+    /* Sanity check */
+    if ($min >= $max) {
+      msg_dialog::display(_("Error"), _("Cannot allocate a free ID:")." ".sprintf(_("%sPoolMin >= %sPoolMax!"), $attrib), ERROR_DIALOG);
+      return NULL;
+    }
+
+    /* ID to skip */
+    $ldap = $config->get_ldap_link();
+    $id   = NULL;
+
+    /* Try to allocate the ID several times before failing */
+    $tries = 3;
+    while ($tries--) {
+
+      /* Look for ID map entry */
+      $ldap->cd ($config->current['BASE']);
+      $ldap->search ("(&(objectClass=sambaUnixIdPool)($attrib=*))", array("$attrib"));
+
+      /* If it does not exist, create one with these defaults */
+      if ($ldap->count() == 0) {
+        /* Fill informational values */
+        $minUserId  = $config->get_cfg_value('uidPoolMin',  10000);
+        $minGroupId = $config->get_cfg_value('gidPoolMin',  10000);
+
+        /* Add as default */
+        $attrs = array(
+          'objectClass' => array('organizationalUnit', 'sambaUnixIdPool'),
+          'ou'          => 'idmap',
+          'uidNumber'   => $minUserId,
+          'gidNumber'   => $minGroupId,
+        );
+        $ldap->cd('ou=idmap,'.$config->current['BASE']);
+        $ldap->add($attrs);
+        if (!$ldap->success()) {
+          msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), 'ou=idmap,'.$config->current['BASE'], LDAP_ADD, ERROR_DIALOG));
+          return NULL;
+        }
+        $tries++;
+        continue;
+      }
+      /* Bail out if it's not unique */
+      if ($ldap->count() != 1) {
+        msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('sambaUnixIdPool is not unique!'), ERROR_DIALOG);
+        return NULL;
+      }
+
+      /* Store old attrib and generate new */
+      $attrs    = $ldap->fetch();
+      $dn       = $attrs['dn'];
+      $oldAttr  = $attrs[$attrib][0];
+      $newAttr  = $oldAttr + 1;
+
+      /* Sanity check */
+      if ($newAttr >= $max) {
+        msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('no ID available!'), ERROR_DIALOG);
+        return NULL;
+      }
+      if ($newAttr < $min) {
+        msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('no ID available!'), ERROR_DIALOG);
+        return NULL;
+      }
+
+      $ldap->cd($dn);
+      $ldap->modify(array($attrib => $newAttr));
+      if (!$ldap->success()) {
+        msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '.$ldap->get_error(), ERROR_DIALOG);
+        return NULL;
+      } else {
+        return $oldAttr;
+      }
+    }
+
+    /* Bail out if we had problems getting the next id */
+    if (!$tries) {
+      msg_dialog::display(_('Error'), _('Cannot allocate a free ID:').' '._('maximum tries exceeded!'), ERROR_DIALOG);
+    }
+
+    return $id;
+  }
+
+  /*!
+   * \brief Get next id in a traditional unix way
+   *
+   * \param string $attrib attribute to use to find the next id.
+   *
+   * \param String $dn Dn we want an id for.
+   *
+   * \return Return the next id
+   */
+  protected static function getNextIdTraditional($attrib)
+  {
+    global $config;
+
+    $ids = array();
+    $ldap = $config->get_ldap_link();
+
+    $ldap->cd ($config->current['BASE']);
+    if (preg_match('/gidNumber/i', $attrib)) {
+      $oc = 'posixGroup';
+    } else {
+      $oc = 'posixAccount';
+    }
+    $ldap->search ("(&(objectClass=$oc)($attrib=*))", array("$attrib"));
+
+    /* Get list of ids */
+    while ($attrs = $ldap->fetch()) {
+      $ids[] = (int)$attrs["$attrib"][0];
+    }
+
+    /* Add the nobody id */
+    $ids[] = 65534;
+
+    /* get the ranges */
+    $tmp = array('0' => 1000);
+    if (preg_match('/posixAccount/', $oc) && $config->get_cfg_value('uidNumberBase') != '') {
+      $tmp = explode('-', $config->get_cfg_value('uidNumberBase'));
+    } elseif ($config->get_cfg_value('gidNumberBase') != '') {
+      $tmp = explode('-', $config->get_cfg_value('gidNumberBase'));
+    }
+
+    /* Set hwm to max if not set - for backward compatibility */
+    $base = $tmp[0];
+    if (isset($tmp[1])) {
+      $hwm = $tmp[1];
+    } else {
+      $hwm = pow(2, 32);
+    }
+    /* Find out next free id near to UID_BASE */
+    for ($id = $base; $id++; $id < $hwm) {
+      if (!in_array($id, $ids)) {
+        return $id;
+      }
+    }
+
+    /* Should not happen */
+    if ($id == $hwm) {
+      msg_dialog::display(_('Error'), _('Cannot allocate a free ID!'), ERROR_DIALOG);
+      exit;
+    }
+  }
+
+  /*!
+   * \brief Get idNumber from external hook
+   *
+   * \param array $attrib
+   *
+   * \param string $dn The DN
+   */
+  protected static function getNextIdHook($attrib, $dn)
+  {
+    global $config;
+
+    if ($config->get_cfg_value("nextIdHook") != "") {
+      /* Call hook script - if present */
+      $command = $config->get_cfg_value("nextIdHook");
+
+      if ($command != "") {
+        $command .= " ".escapeshellarg($dn)." ".escapeshellarg($attrib);
+        if (check_command($command)) {
+          @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
+          exec($command, $output);
+          if (is_numeric($output[0])) {
+            return $output[0];
+          }
+        }
+      }
+    }
+
+    msg_dialog::display(_("Warning"), _("'nextIdHook' is not available. Using default base!"), WARNING_DIALOG);
+    return $config->get_cfg_value("uidNumberBase");
+  }
+}
+?>
diff --git a/kolab2/personal/kolab2/main.inc b/posix/personal/posix/main.inc
similarity index 88%
rename from kolab2/personal/kolab2/main.inc
rename to posix/personal/posix/main.inc
index c39e13bba918d81727d82324f85f4825626b380d..ec9bacffaaac6c237e8369e00d9b24a0cf53c255 100644
--- a/kolab2/personal/kolab2/main.inc
+++ b/posix/personal/posix/main.inc
@@ -1,7 +1,8 @@
 <?php
+
 /*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org)
-  Copyright (C) 2011-2016  FusionDirectory
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2012-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
@@ -18,6 +19,5 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-kolabAccount::mainInc('kolabAccount', $ui->dn);
-
+posixAccount::mainInc('posixAccount', $ui->dn);
 ?>
diff --git a/postfix/admin/systems/services/postfix/class_servicePostfix.inc b/postfix/admin/systems/services/postfix/class_servicePostfix.inc
index 8e4fe76017d3acc1b6d9ec9458f7438534d92a48..11d5a388af4dcae5ab0b95e119f7fc832beed43d 100644
--- a/postfix/admin/systems/services/postfix/class_servicePostfix.inc
+++ b/postfix/admin/systems/services/postfix/class_servicePostfix.inc
@@ -134,11 +134,18 @@ class servicePostfix extends simpleService
     );
   }
 
-  function ldap_save ($cleanup = TRUE)
+  protected function shouldSave()
+  {
+    /* We need ldap_save to always run */
+    return TRUE;
+  }
+
+  function ldap_save ()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
     $this->attributesAccess['fdPostfixTransportTable']->postLdapSave($config->get_ldap_link());
+    return $errors;
   }
 }
 ?>
diff --git a/postfix/locale/ar/fusiondirectory.po b/postfix/locale/ar/fusiondirectory.po
index d5f0701cd46b01bc04a43400933b9fd0ba53d64c..3c47cb57414cfb5ef6f5dbad562e5adea6f975a4 100644
--- a/postfix/locale/ar/fusiondirectory.po
+++ b/postfix/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/ca/fusiondirectory.po b/postfix/locale/ca/fusiondirectory.po
index c9365fc0b46e76cd1c32cf459dc5ad48318c6377..a122570e69dc41d47b1bb830bacaf87934cfc508 100644
--- a/postfix/locale/ca/fusiondirectory.po
+++ b/postfix/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/cs_CZ/fusiondirectory.po b/postfix/locale/cs_CZ/fusiondirectory.po
index fcc1a54e3f8f7122b93b918075dfa8c23d77a03c..203405fe730afba2f3349290e5852e311ec41111 100644
--- a/postfix/locale/cs_CZ/fusiondirectory.po
+++ b/postfix/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr "Postfix (SMTP)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
 msgid "Information"
@@ -40,7 +41,7 @@ msgstr "NÃ¡zev stroje."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:52
 msgid "Domain"
-msgstr "DomÃ©na"
+msgstr "domÃ©na"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:52
 msgid "The domain."
@@ -72,7 +73,7 @@ msgstr "UrÄuje nejvÄ›tÅ¡Ã povolenou velikost zprÃ¡vy."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:74
 msgid "Domains and routing"
-msgstr "DomÃ©ny a smÄ›rovÃ¡nÃ"
+msgstr "domÃ©ny a smÄ›rovÃ¡nÃ"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:78
 msgid "Domains to accept mail for"
@@ -84,7 +85,7 @@ msgstr "sÃtÄ› Postfixu"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:83
 msgid "Transport table"
-msgstr "TransportnÃ tabulka"
+msgstr "transportnÃ tabulka"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:88
 msgid "Transport rule"
@@ -92,11 +93,11 @@ msgstr "TransportnÃ pravidlo"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:102
 msgid "Restrictions"
-msgstr "OmezenÃ"
+msgstr "omezenÃ"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:106
 msgid "Restrictions for sender"
-msgstr "OmezenÃ odesilatele"
+msgstr "omezenÃ odesilatele"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:115
 msgid "For sender"
@@ -104,7 +105,7 @@ msgstr "Pro odesilatele"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:120
 msgid "Restrictions for recipient"
-msgstr "OmezenÃ pÅ™Ãjemce"
+msgstr "omezenÃ pÅ™Ãjemce"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:129
 msgid "For recipient"
diff --git a/postfix/locale/de/fusiondirectory.po b/postfix/locale/de/fusiondirectory.po
index f5f2dde0716792ca879ac926abe72c7f1af38930..91b35173d37f5a174dc572437200f6a989ac103a 100644
--- a/postfix/locale/de/fusiondirectory.po
+++ b/postfix/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/el_GR/fusiondirectory.po b/postfix/locale/el_GR/fusiondirectory.po
index 831d2a3a37dd73860f99d9e98db30cd0f546cc19..a1226557ea57a25bd422c4dcf0deb67b000333b7 100644
--- a/postfix/locale/el_GR/fusiondirectory.po
+++ b/postfix/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/en/fusiondirectory.po b/postfix/locale/en/fusiondirectory.po
index d8eee2daf0b768928d64654e10ba85a34efa6166..f031668756836e9de701d08bb8509b79def1d888 100644
--- a/postfix/locale/en/fusiondirectory.po
+++ b/postfix/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/postfix/locale/es/fusiondirectory.po b/postfix/locale/es/fusiondirectory.po
index c26a40ecf67f257f4b952aca697afd8b0d33d4bf..24b9ae28c4fc92a5dedb1486a24ef4689ae45028 100644
--- a/postfix/locale/es/fusiondirectory.po
+++ b/postfix/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/es_CO/fusiondirectory.po b/postfix/locale/es_CO/fusiondirectory.po
index f99a34cda417fac50828a1805d0dd6bdedec4dc1..6ed087201f5b9f12b9197810357322dd94588d15 100644
--- a/postfix/locale/es_CO/fusiondirectory.po
+++ b/postfix/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/es_VE/fusiondirectory.po b/postfix/locale/es_VE/fusiondirectory.po
index c670378ececf9ae3234dcf41217c76e336ff895c..d13fcb308a9a292dca0fb484ce1cff06d4189e02 100644
--- a/postfix/locale/es_VE/fusiondirectory.po
+++ b/postfix/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/fa_IR/fusiondirectory.po b/postfix/locale/fa_IR/fusiondirectory.po
index d17d4d99ebaf066b3b902874516bd126b1514398..33398b120536f75385b80fde65f7c8724fe76398 100644
--- a/postfix/locale/fa_IR/fusiondirectory.po
+++ b/postfix/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/fi_FI/fusiondirectory.po b/postfix/locale/fi_FI/fusiondirectory.po
index 657f7d776e7266b6fb87f08b0aa1822b3f46619b..def3a4a455936fa5a8dbb795c4d902562e410255 100644
--- a/postfix/locale/fi_FI/fusiondirectory.po
+++ b/postfix/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/fr/fusiondirectory.po b/postfix/locale/fr/fusiondirectory.po
index 4f2f005d2544816ce09e4ea14afacf1ad2af17a8..08f926e031d47e77975486e16c95b05c63b6723a 100644
--- a/postfix/locale/fr/fusiondirectory.po
+++ b/postfix/locale/fr/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr "Postfix (SMTP)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:44
 msgid "Information"
@@ -32,7 +33,7 @@ msgstr "Information"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
-msgstr "Nom d'hÃ´te"
+msgstr "Nom de l'hÃ´te"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "The host name."
diff --git a/postfix/locale/hu_HU/fusiondirectory.po b/postfix/locale/hu_HU/fusiondirectory.po
index b407fcae8704cc15c71248749fa9627913423985..12a96fdf91392c5abfedc4f28c63fe5ae7f9535a 100644
--- a/postfix/locale/hu_HU/fusiondirectory.po
+++ b/postfix/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/id/fusiondirectory.po b/postfix/locale/id/fusiondirectory.po
index 3dd3998ce96485cbb29eb8d7378503d020d910c8..528a8bf2609e5861704758d11fc598ae7ce324fc 100644
--- a/postfix/locale/id/fusiondirectory.po
+++ b/postfix/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/it_IT/fusiondirectory.po b/postfix/locale/it_IT/fusiondirectory.po
index af5f6cd03f1fef65c60146162d151e177224052f..08bf448629f777f54daa31f0abf20dc88033cb06 100644
--- a/postfix/locale/it_IT/fusiondirectory.po
+++ b/postfix/locale/it_IT/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,7 +53,9 @@ msgstr "Dimensione massima dell'intestazione della mail (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:57
 msgid "This value specifies the maximal header size."
-msgstr "Questo valore specifica la dimensione massima dell'intestazione dei messaggi."
+msgstr ""
+"Questo valore specifica la dimensione massima dell'intestazione dei "
+"messaggi."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:62
 msgid "Max mailbox size (KB)"
diff --git a/postfix/locale/lv/fusiondirectory.po b/postfix/locale/lv/fusiondirectory.po
index b1ab48f1d2ee8de32f4fc5582375e3d3c6ae023b..22bcf480b3e69b0c49ee1ee643f76ac6221280da 100644
--- a/postfix/locale/lv/fusiondirectory.po
+++ b/postfix/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/nb/fusiondirectory.po b/postfix/locale/nb/fusiondirectory.po
index 44f843d571c09dd0b40870270191b0452f2b3483..0b9efa8c58b6a930e0505a41a2d6d74857f8e995 100644
--- a/postfix/locale/nb/fusiondirectory.po
+++ b/postfix/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/nl/fusiondirectory.po b/postfix/locale/nl/fusiondirectory.po
index 1f242eb34959ceb7371d4243d8b279bab8703e23..0219c1220851d0d0e66b53c0eefc7fe8f9ea1715 100644
--- a/postfix/locale/nl/fusiondirectory.po
+++ b/postfix/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: admin/systems/services/postfix/class_servicePostfix.inc:29
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Postfix (SMTP)"
-msgstr ""
+msgstr "Postfix (SMTP)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:30
 msgid "Services"
@@ -32,7 +33,7 @@ msgstr "Informatie"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "Hostname"
-msgstr ""
+msgstr "hostname"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:47
 msgid "The host name."
@@ -44,7 +45,7 @@ msgstr "Domein"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:52
 msgid "The domain."
-msgstr ""
+msgstr "Het domein."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:57
 msgid "Max mail header size (KB)"
@@ -56,7 +57,7 @@ msgstr "Deze waarde bepaal de maximale header grootte."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:62
 msgid "Max mailbox size (KB)"
-msgstr ""
+msgstr "Maximum grootte van de mailbox (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:62
 msgid "Defines the maximal size of mail box."
@@ -64,7 +65,7 @@ msgstr "Bepaalt de maximale grootte van de mail  box."
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:67
 msgid "Max message size (KB)"
-msgstr ""
+msgstr "Maximum grootte van het bericht (KB)"
 
 #: admin/systems/services/postfix/class_servicePostfix.inc:67
 msgid "Specify the maximal size of a message."
diff --git a/postfix/locale/pl/fusiondirectory.po b/postfix/locale/pl/fusiondirectory.po
index 977e6256790696d067a575df9d0c0d0f2b37de09..f4d984ba3e3470126af81de7108130d263e7ca4c 100644
--- a/postfix/locale/pl/fusiondirectory.po
+++ b/postfix/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/pt/fusiondirectory.po b/postfix/locale/pt/fusiondirectory.po
index cba82131009fa2fb3ee20bcc94b95805b8ca000f..7f22423ce655add2c8005deffef54c6b2ee79abe 100644
--- a/postfix/locale/pt/fusiondirectory.po
+++ b/postfix/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/pt_BR/fusiondirectory.po b/postfix/locale/pt_BR/fusiondirectory.po
index 64473dad13ee21170b785046ac4bb4c4898ae75d..f79d083567c2c19175bdcaeff7eed7eb335f13f7 100644
--- a/postfix/locale/pt_BR/fusiondirectory.po
+++ b/postfix/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/ru/fusiondirectory.po b/postfix/locale/ru/fusiondirectory.po
index 81482338f7753fecf74e8614bda82de0e7ebcb7a..f5eb20698fdfd5078a99f9f8ad0ced8e916fb773 100644
--- a/postfix/locale/ru/fusiondirectory.po
+++ b/postfix/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/ru@petr1708/fusiondirectory.po b/postfix/locale/ru@petr1708/fusiondirectory.po
index bdcb373a451b3e341b3684f0439256a010e0820c..a64172c635c4b63957103e892cfb34e868fae603 100644
--- a/postfix/locale/ru@petr1708/fusiondirectory.po
+++ b/postfix/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/sv/fusiondirectory.po b/postfix/locale/sv/fusiondirectory.po
index f76f34fb373f664bffe5504df19d4415ae8be866..907ff7ce96660cd585795bc5611ede25bbef0311 100644
--- a/postfix/locale/sv/fusiondirectory.po
+++ b/postfix/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/ug/fusiondirectory.po b/postfix/locale/ug/fusiondirectory.po
index 9708d49fe62572dc446d734403fa5edfb6b0462e..75d0958132a45e49ffcd4f72125f2855a6a0b88f 100644
--- a/postfix/locale/ug/fusiondirectory.po
+++ b/postfix/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/vi_VN/fusiondirectory.po b/postfix/locale/vi_VN/fusiondirectory.po
index d6a1d9da0b3230be7cab1563124f946edd22297e..de2333f841371850b73a0b4b2f13502993d91877 100644
--- a/postfix/locale/vi_VN/fusiondirectory.po
+++ b/postfix/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/postfix/locale/zh/fusiondirectory.po b/postfix/locale/zh/fusiondirectory.po
index f119d52c9be6bee9b82febe499f944c16bc2a636..2fa0327e49e8a64ade43215addccd609fb1aaedb 100644
--- a/postfix/locale/zh/fusiondirectory.po
+++ b/postfix/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
index 650fe2f947c9e6d7353e5d5d9ae81ed731e9e682..6b6215f7ebc6528ae53930af3a4c9fa2fa465746 100644
--- a/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
+++ b/ppolicy/addons/dashboard/class_dashBoardPPolicy.inc
@@ -85,9 +85,6 @@ class dashboardPpolicy extends simplePlugin
     $now = new DateTime('now', timezone::utc());
 
     /* search all expired accounts */
-    $ldap->cd($config->current['BASE']);
-    $ldap->search('(&(|(objectClass=posixAccount)(objectClass=sambaSamAccount))(shadowExpire=*))',
-                  array('uid','shadowExpire','mail','telephoneNumber','cn','manager'));
     $users = objects::ls('user', array(
         'dn'                    => 'raw',
         'uid'                   => 'raw',
@@ -102,12 +99,12 @@ class dashboardPpolicy extends simplePlugin
     $locked_users           = array();
     $expired_accounts       = array();
     $next_expired_accounts  = array();
-    /*  ppolicies cache */
+    // ppolicies cache
     $maxAges = array();
     foreach ($users as $user) {
       if (isset($user['pwdAccountLockedTime'])) {
         $locked_user  = dashboardUsers::get_user_infos($user);
-        $lockedTime   = DateTime::createFromFormat('YmdHis\Z', $user['pwdAccountLockedTime'], timezone::utc());
+        $lockedTime   = LdapGeneralizedTime::fromString($user['pwdAccountLockedTime']);
         $lockedTime->setTimezone(timezone::getDefaultTimeZone());
         $locked_user['pwdAccountLockedTime']  = $lockedTime->format('Y-m-d H:i:s');
         $locked_users[]                       = $locked_user;
@@ -142,7 +139,8 @@ class dashboardPpolicy extends simplePlugin
         /* No max age, it canâ€™t be expired */
         continue;
       }
-      $lastChange = DateTime::createFromFormat('YmdHis\Z', $user['pwdChangedTime'], timezone::utc());
+      $lastChange = LdapGeneralizedTime::fromString($user['pwdChangedTime']);
+      $lastChange->setTimezone(timezone::utc());
       if (($lastChange->getTimeStamp() + $maxAge) < $now->getTimeStamp()) {
         $expired_accounts[] = dashboardUsers::get_user_infos($user);
       } elseif (($lastChange->getTimeStamp() + $maxAge) < ($now->getTimeStamp() + $next_expired_days_seconds)) {
diff --git a/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl b/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
index 05202a0cdb85e6823db0f21dd7f72f3b4eb4347c..f5ce671e06017a8995e4bac2044f834ba1e36dd7 100644
--- a/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
+++ b/ppolicy/addons/dashboard/ppolicy_locked_accounts.tpl
@@ -4,13 +4,13 @@
   </span>
   <div>
     <h1>
-    {if $attributes.locked.accounts|@count >= 1}
+    {if $attributes.locked.accounts|@count > 0}
       {t count=$attributes.locked.accounts|@count 1=$attributes.locked.accounts|@count plural="There are %1 locked accounts"}There is one locked account{/t}
     {else}
       {t}There is no locked account{/t}
     {/if}
     </h1>
-    {if $attributes.locked.accounts|@count >= 1}
+    {if $attributes.locked.accounts|@count > 0}
       <table style="width: 100%;" class="listingTable">
         <colgroup>
           <col width="10%"/>
diff --git a/ppolicy/locale/ar/fusiondirectory.po b/ppolicy/locale/ar/fusiondirectory.po
index 15a5a955c6191006150f2aae710aa95bc81d867b..65acd445f674749dc0a4019d48e75018531a0ff7 100644
--- a/ppolicy/locale/ar/fusiondirectory.po
+++ b/ppolicy/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 e0f8842bcd14b5ac64046388b623c68cc5ad93b3..e2746712e4dcb2a878e467b601a532376517e4c8 100644
--- a/ppolicy/locale/ca/fusiondirectory.po
+++ b/ppolicy/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Error de la configuraciÃ³"
 
@@ -111,7 +112,7 @@ msgstr "Error de la configuraciÃ³"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 6e0701fa772c5c64498db49a949d979b2bbca9d9..213553d4322ef0a0b571aadc3409910f42c61d86 100644
--- a/ppolicy/locale/cs_CZ/fusiondirectory.po
+++ b/ppolicy/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,16 +103,16 @@ msgid "Locked accounts"
 msgstr "UzamÄenÃ© ÃºÄty"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
-msgstr "Chyba v nastavenÃ"
+msgstr "chyba v nastavenÃ"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:72
 #, php-format
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "VÃ½chozÃ ppolicy %s nebyla v LDAP nalezena!"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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!"
@@ -163,7 +163,7 @@ msgstr "NÃ¡zev zÃ¡sady"
 
 #: admin/ppolicy/class_ppolicy.inc:60
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/ppolicy/class_ppolicy.inc:60
 msgid "A short description of this policy"
@@ -177,7 +177,9 @@ msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ¡ dÃ©lka"
 msgid ""
 "Minimum length of the user supplied password - passwords shorter than this "
 "value will be rejected"
-msgstr "NejkratÅ¡Ã pÅ™ijatelnÃ¡ dÃ©lka hesel, kterou budou uÅ¾ivatelÃ© moci pouÅ¾Ãt ke svÃ½m ÃºÄtÅ¯m â€“ kratÅ¡Ã hesla budou zamÃtÃ¡na"
+msgstr ""
+"NejkratÅ¡Ã pÅ™ijatelnÃ¡ dÃ©lka hesel, kterou budou uÅ¾ivatelÃ© moci pouÅ¾Ãt ke svÃ½m"
+" ÃºÄtÅ¯m â€“ kratÅ¡Ã hesla budou zamÃtÃ¡na"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Passwords in history"
@@ -191,7 +193,7 @@ msgstr "PoÄet hesel, kterÃ© jsou uchovÃ¡vÃ¡ny v seznamu dÅ™Ãve pouÅ¾itÃ½ch"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum password age"
-msgstr "Za jak dlouho nejdÅ™Ãve mÅ¯Å¾e bÃ½t heslo znovu zmÄ›nÄ›no"
+msgstr "minimÃ¡lnÃ stÃ¡Å™Ã hesla"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum time between password changes"
@@ -199,14 +201,17 @@ msgstr "Za jak dlouho nejdÅ™Ãve lze heslo opÄ›t zmÄ›nit"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid "Maximum password age"
-msgstr "Jak dlouho nejvÃ½Å¡e budou hesla platnÃ¡"
+msgstr "maximÃ¡lnÃ stÃ¡Å™Ã hesla"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
 "Maximum time a password is valid, after which it is deemed to be no longer "
 "usable and any bind operations attempted with the expired password will be "
 "treated as invalid"
-msgstr "NejdelÅ¡Ã umoÅ¾nÄ›nÃ¡ doba, po kterou je heslo platnÃ©. Po jejÃm uplynutÃ bude povaÅ¾ovÃ¡no za nepouÅ¾itelnÃ© a jakÃ½koli pokus o spojenÃ s pouÅ¾itÃm tohoto hesla, jehoÅ¾ platnost skonÄila, bude povaÅ¾ovÃ¡n za neplatnÃ½"
+msgstr ""
+"NejdelÅ¡Ã umoÅ¾nÄ›nÃ¡ doba, po kterou je heslo platnÃ©. Po jejÃm uplynutÃ bude "
+"povaÅ¾ovÃ¡no za nepouÅ¾itelnÃ© a jakÃ½koli pokus o spojenÃ s pouÅ¾itÃm tohoto "
+"hesla, jehoÅ¾ platnost skonÄila, bude povaÅ¾ovÃ¡n za neplatnÃ½"
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Expiry warning delay"
@@ -217,7 +222,10 @@ msgid ""
 "Defines the start time - in seconds - prior to the password expiry that "
 "password expiry warning messages are returned in bind responses. 0 to "
 "disable"
-msgstr "UrÄuje Äas â€“ sekundÃ¡ch â€“ pÅ™ed skonÄenÃm platnosti hesla, kdy zaÄnou bÃ½t pÅ™i spojovÃ¡nÃ zasÃlÃ¡na varovÃ¡nÃ o blÃÅ¾ÃcÃm se skonÄenÃ platnosti hesla. Funkci zakÃ¡Å¾ete nastavenÃm na hodnotu 0 (nula)"
+msgstr ""
+"UrÄuje Äas â€“ sekundÃ¡ch â€“ pÅ™ed skonÄenÃm platnosti hesla, kdy zaÄnou bÃ½t pÅ™i "
+"spojovÃ¡nÃ zasÃlÃ¡na varovÃ¡nÃ o blÃÅ¾ÃcÃm se skonÄenÃ platnosti hesla. Funkci "
+"zakÃ¡Å¾ete nastavenÃm na hodnotu 0 (nula)"
 
 #: admin/ppolicy/class_ppolicy.inc:89
 msgid "Grace period"
@@ -227,7 +235,9 @@ msgstr "Doba odkladu"
 msgid ""
 "Number of times a user is allowed to successfully bind using an expired "
 "password"
-msgstr "KolikrÃ¡t bude uÅ¾ivateli dovoleno se ÃºspÄ›Å¡nÄ› pÅ™ipojit i s heslem, jehoÅ¾ platnost skonÄila"
+msgstr ""
+"KolikrÃ¡t bude uÅ¾ivateli dovoleno se ÃºspÄ›Å¡nÄ› pÅ™ipojit i s heslem, jehoÅ¾ "
+"platnost skonÄila"
 
 #: admin/ppolicy/class_ppolicy.inc:94
 msgid "Allow user change"
@@ -257,7 +267,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:107
 msgid "Disabled"
-msgstr "Vypnuto"
+msgstr "zakÃ¡zÃ¡no"
 
 #: admin/ppolicy/class_ppolicy.inc:107
 msgid "Ignore errors"
@@ -290,7 +300,10 @@ msgstr "Zapnout uzamykÃ¡nÃ"
 msgid ""
 "Whether to lock an account that had more consecutive failed bind attempts "
 "with invalid passwords than is defined by \"Maximum failures\""
-msgstr "Zda uzamknout ÃºÄet, kterÃ½ se nÄ›kolikrÃ¡t za sebou neÃºspÄ›Å¡nÄ› pokusil spojit s neplatnÃ½m heslem. Limit urÄuje poloÅ¾ka NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet neÃºspÄ›Å¡nÃ½ch pokusÅ¯"
+msgstr ""
+"Zda uzamknout ÃºÄet, kterÃ½ se nÄ›kolikrÃ¡t za sebou neÃºspÄ›Å¡nÄ› pokusil spojit s "
+"neplatnÃ½m heslem. Limit urÄuje poloÅ¾ka NejvyÅ¡Å¡Ã umoÅ¾nÄ›nÃ½ poÄet neÃºspÄ›Å¡nÃ½ch "
+"pokusÅ¯"
 
 #: admin/ppolicy/class_ppolicy.inc:125
 msgid "Lock out duration"
@@ -300,7 +313,9 @@ msgstr "Doba trvÃ¡nÃ uzamÄenÃ"
 msgid ""
 "Time the account remains locked after an automatic lock out (0 means for "
 "ever)"
-msgstr "Doba, po kterou ÃºÄet zÅ¯stane zamÄenÃ½ pro samoÄinnÃ©m zamÄenÃ (0 znamenÃ¡ napoÅ™Ã¡d)"
+msgstr ""
+"Doba, po kterou ÃºÄet zÅ¯stane zamÄenÃ½ pro samoÄinnÃ©m zamÄenÃ (0 znamenÃ¡ "
+"napoÅ™Ã¡d)"
 
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid "Maximum failures"
@@ -309,7 +324,8 @@ msgstr "NejvÃ½Å¡e pÅ™ijatelnÃ½ch nezdarÅ¯"
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid ""
 "Number of consecutive password failures allowed before automatic lock out"
-msgstr "PoÄet po sobÄ› jdoucÃch chybnÃ½ch zadÃ¡nÃ hesla neÅ¾ dojde k samoÄinnÃ©mu zamÄenÃ"
+msgstr ""
+"PoÄet po sobÄ› jdoucÃch chybnÃ½ch zadÃ¡nÃ hesla neÅ¾ dojde k samoÄinnÃ©mu zamÄenÃ"
 
 #: admin/ppolicy/class_ppolicy.inc:135
 msgid "Failure count interval"
@@ -319,7 +335,10 @@ msgstr "RozmezÃ poÄtu nezdarÅ¯"
 msgid ""
 "Time after which the count of consecutive password failures is reset even if"
 " no successful authentication has occurred"
-msgstr "Doba, po jejÃmÅ¾ uplynutÃ budou chybnÃ¡, po sobÄ› jdoucÃ zadÃ¡nÃ hesla poÄÃtÃ¡na od znovu. Reset tohoto poÄitadla je spuÅ¡tÄ›n buÄ takto Äasem, nebo sprÃ¡vnÃ½m zadÃ¡nÃm hesla."
+msgstr ""
+"Doba, po jejÃmÅ¾ uplynutÃ budou chybnÃ¡, po sobÄ› jdoucÃ zadÃ¡nÃ hesla poÄÃtÃ¡na "
+"od znovu. Reset tohoto poÄitadla je spuÅ¡tÄ›n buÄ takto Äasem, nebo sprÃ¡vnÃ½m "
+"zadÃ¡nÃm hesla."
 
 #: admin/ppolicy/class_ppolicy.inc:140
 msgid "Must change"
@@ -329,14 +348,16 @@ msgstr "Vynutit zmÄ›nu"
 msgid ""
 "Whether the user must change their password after an account is reset by an "
 "administrator following an automatic lockout"
-msgstr "Zda uÅ¾ivatele pÅ™imÄ›t ke zmÄ›nÄ› hesla po obnovenÃ pÅ™Ãstupu sprÃ¡vcem po samoÄinnÃ©m zamÄenÃ ÃºÄtu"
+msgstr ""
+"Zda uÅ¾ivatele pÅ™imÄ›t ke zmÄ›nÄ› hesla po obnovenÃ pÅ™Ãstupu sprÃ¡vcem po "
+"samoÄinnÃ©m zamÄenÃ ÃºÄtu"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
-msgstr[0] "Je zde jeden uzamÄenÃ½ ÃºÄet"
-msgstr[1] "Jsou zde %1 uzamÄenÃ© ÃºÄty"
-msgstr[2] "Je zde %1 uzamÄenÃ½ch ÃºÄtÅ¯"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
 msgid "There is no locked account"
diff --git a/ppolicy/locale/de/fusiondirectory.po b/ppolicy/locale/de/fusiondirectory.po
index 3da0b370466b8eb06086e7d81d113525c6ba4e0a..b7ba70dfc5eb0305d4b649532c2754fc9fae89d4 100644
--- a/ppolicy/locale/de/fusiondirectory.po
+++ b/ppolicy/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +103,7 @@ msgid "Locked accounts"
 msgstr "Gesperrte Konten"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum password age"
-msgstr "Minimales Passwortalter"
+msgstr "Minimales Passwort-Alter"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum time between password changes"
@@ -199,7 +199,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid "Maximum password age"
-msgstr "Maximales Passwortalter"
+msgstr "Maximales Passwort-Alter"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
diff --git a/ppolicy/locale/el_GR/fusiondirectory.po b/ppolicy/locale/el_GR/fusiondirectory.po
index 17b730e753321895fa5d983da9d983451a0ae55b..4af444a755575f3fb2888d67f3af33e3cf66921e 100644
--- a/ppolicy/locale/el_GR/fusiondirectory.po
+++ b/ppolicy/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,7 +103,7 @@ msgid "Locked accounts"
 msgstr "ÎšÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î¿Î¹ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 
@@ -113,10 +112,12 @@ msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr "Î”ÎµÎ½ Î®Ï„Î±Î½ Î´Ï…Î½Î±Ï„Î® Î· ÎµÏÏÎµÏƒÎ· Ï„Î¿Ï… Ppolicy \"%s\" ÏƒÏ„Î¿ LDAP!"
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
-msgstr "Î— Ppolicy \"%s\" Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ Î³Î¹Î± Ï‡ÏÎ®ÏƒÏ„Î· \"%s\" Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯ ÏƒÏ„Î¿ LDAP!"
+msgstr ""
+"Î— Ppolicy \"%s\" Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ Î³Î¹Î± Ï‡ÏÎ®ÏƒÏ„Î· \"%s\" Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯ ÏƒÏ„Î¿"
+" LDAP!"
 
 #: config/ppolicy/class_ppolicyConfig.inc:29
 msgid "Ppolicy plugin configuration"
@@ -178,7 +179,9 @@ msgstr "Î•Î»Î¬Ï‡Î¹ÏƒÏ„Î¿ Î¼Î®ÎºÎ¿Ï‚ "
 msgid ""
 "Minimum length of the user supplied password - passwords shorter than this "
 "value will be rejected"
-msgstr "Î¤Î¿ ÎµÎ»Î¬Ï‡Î¹ÏƒÏ„Î¿ Î¼Î®ÎºÎ¿Ï‚  Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·- ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î¼Î¹ÎºÏÏŒÏ„ÎµÏÎ¿Î¹ Î±Ï€ÏŒ Î±Ï…Ï„Î® Ï„Î·Î½ Ï„Î¹Î¼Î® Î¸Î± Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Î½Ï„Î±Î¹"
+msgstr ""
+"Î¤Î¿ ÎµÎ»Î¬Ï‡Î¹ÏƒÏ„Î¿ Î¼Î®ÎºÎ¿Ï‚  Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·- ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Î¼Î¹ÎºÏÏŒÏ„ÎµÏÎ¿Î¹ Î±Ï€ÏŒ Î±Ï…Ï„Î® Ï„Î·Î½ "
+"Ï„Î¹Î¼Î® Î¸Î± Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Î½Ï„Î±Î¹"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Passwords in history"
@@ -188,7 +191,9 @@ msgstr "ÎšÏ‰Î´Î¹ÎºÎ¿Î¯ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ"
 msgid ""
 "Number of passwords that are maintained in a list of previously used "
 "passwords"
-msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ Ï€Î¿Ï… Î¸Î± Î´Î¹Î±Ï„Î·ÏÎ¿ÏÎ½Ï„Î±Î¹ ÏƒÎµ Î¼Î¹Î± Î»Î¯ÏƒÏ„Î± Ï€Î±Î»Î¹ÏŽÎ½ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Î¼ÎÎ½Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½"
+msgstr ""
+"Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ Ï€Î¿Ï… Î¸Î± Î´Î¹Î±Ï„Î·ÏÎ¿ÏÎ½Ï„Î±Î¹ ÏƒÎµ Î¼Î¹Î± Î»Î¯ÏƒÏ„Î± Ï€Î±Î»Î¹ÏŽÎ½ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Î¼ÎÎ½Ï‰Î½ "
+"ÎºÏ‰Î´Î¹ÎºÏŽÎ½"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum password age"
@@ -207,7 +212,9 @@ msgid ""
 "Maximum time a password is valid, after which it is deemed to be no longer "
 "usable and any bind operations attempted with the expired password will be "
 "treated as invalid"
-msgstr "ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÎµÎ³ÎºÏ…ÏÏŒÏ„Î·Ï„Î±Ï‚ ÎµÎ½ÏŒÏ‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï, Î¼Îµ Ï„Î·Î½ Î»Î®Î¾Î· Ï„Î¿Ï… Î¿Ï€Î¿Î¯Î¿Ï… Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î¸Î± ÎµÎ¯Î½Î±Î¹ Î¬Ï‡ÏÎ·ÏƒÏ„Î¿Ï‚ ÎºÎ±Î¹ ÏŒÎ»ÎµÏ‚ Î¿Î¹ Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½ÎµÏ‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯ÎµÏ‚ Î¸Î± Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Î½Ï„Î±Î¹."
+msgstr ""
+"ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÎµÎ³ÎºÏ…ÏÏŒÏ„Î·Ï„Î±Ï‚ ÎµÎ½ÏŒÏ‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï, Î¼Îµ Ï„Î·Î½ Î»Î®Î¾Î· Ï„Î¿Ï… Î¿Ï€Î¿Î¯Î¿Ï… Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ "
+"Î¸Î± ÎµÎ¯Î½Î±Î¹ Î¬Ï‡ÏÎ·ÏƒÏ„Î¿Ï‚ ÎºÎ±Î¹ ÏŒÎ»ÎµÏ‚ Î¿Î¹ Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½ÎµÏ‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯ÎµÏ‚ Î¸Î± Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Î½Ï„Î±Î¹."
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Expiry warning delay"
@@ -310,7 +317,8 @@ msgstr "ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Î±Ï€Î¿Ï„Ï…Ï‡Î¹ÏŽÎ½"
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid ""
 "Number of consecutive password failures allowed before automatic lock out"
-msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î±Ï€Î¿Ï„Ï…Ï‡Î·Î¼ÎÎ½Ï‰Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³ÏŽÎ½ ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÎ¹Î½ Î±Ï€ÏŒ Ï„Î¿ ÎºÎ»ÎµÎ¯Î´Ï‰Î¼Î± Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
+msgstr ""
+"Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î±Ï€Î¿Ï„Ï…Ï‡Î·Î¼ÎÎ½Ï‰Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³ÏŽÎ½ ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÎ¹Î½ Î±Ï€ÏŒ Ï„Î¿ ÎºÎ»ÎµÎ¯Î´Ï‰Î¼Î± Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï"
 
 #: admin/ppolicy/class_ppolicy.inc:135
 msgid "Failure count interval"
@@ -335,8 +343,8 @@ msgstr ""
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
-msgstr[0] "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ ÎÎ½Î±Ï‚ ÎºÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚"
-msgstr[1] "Î¥Ï€Î¬ÏÏ‡ÎµÎ¹ %1  ÎºÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î¿Î¹ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯"
+msgstr[0] ""
+msgstr[1] ""
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
 msgid "There is no locked account"
diff --git a/ppolicy/locale/en/fusiondirectory.po b/ppolicy/locale/en/fusiondirectory.po
index e58339e911c43e1495ebebe4c56bcee37a810815..6bc6a11401fd4ce7bc4efba71aed31efcd1c9967 100644
--- a/ppolicy/locale/en/fusiondirectory.po
+++ b/ppolicy/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -103,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
diff --git a/ppolicy/locale/es/fusiondirectory.po b/ppolicy/locale/es/fusiondirectory.po
index c77cf65fdcb65746ff03103047875fc8c160d542..ced84e0d1479b173f560f1f3b492aa6040ba7ab0 100644
--- a/ppolicy/locale/es/fusiondirectory.po
+++ b/ppolicy/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
@@ -111,7 +112,7 @@ msgstr "Error en la configuraciÃ³n"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 a1982c807bca96fd770ee4ccf60c9c9a0b2b8f0e..80e5548e89e9429f7bace2c67eec6938b6402575 100644
--- a/ppolicy/locale/es_CO/fusiondirectory.po
+++ b/ppolicy/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Error de configuraciÃ³n"
 
@@ -111,7 +112,7 @@ msgstr "Error de configuraciÃ³n"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 17ef85b25a4c34b2fa365d05ae4cf5bc243364d2..932421e97b3f261c65da970d08f5c081c054c4fa 100644
--- a/ppolicy/locale/es_VE/fusiondirectory.po
+++ b/ppolicy/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
@@ -111,7 +112,7 @@ msgstr "Error en la configuraciÃ³n"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 a580b9fed34e87fe4f8d54bc700e4ec0ef915b3b..c16e59ba9fd82c11a69d0d022e0eed71d7a26c8d 100644
--- a/ppolicy/locale/fa_IR/fusiondirectory.po
+++ b/ppolicy/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 e85babe816a1fd8e70c7236a1172003b3e22778c..d83b17481b7addb7de99e6a67101c2077ed2c005 100644
--- a/ppolicy/locale/fi_FI/fusiondirectory.po
+++ b/ppolicy/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 8e4050c722a02487c71026544c6eb9ede348c3f4..fdc1623f57d2c1253efe06853cddc7e93a65f5e9 100644
--- a/ppolicy/locale/fr/fusiondirectory.po
+++ b/ppolicy/locale/fr/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# gallak <antoine.gallavardin@free.fr>, 2015
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,7 +59,9 @@ msgstr "RÃ©initialiser verrouillage / changement obligatoire"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:59
 msgid "Resets the lock status of this account and/or force a password change"
-msgstr "RÃ©initialise l'Ã©tat de verrouillage de ce compte et / ou imposer un changement de mot de passe"
+msgstr ""
+"RÃ©initialise l'Ã©tat de verrouillage de ce compte et / ou imposer un "
+"changement de mot de passe"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:62
 msgid "Force password change (resets locking)"
@@ -81,7 +81,7 @@ msgstr "Jamais"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:90
 msgid "Unlocked"
-msgstr "DÃ©verrouillÃ©"
+msgstr "DÃ©verrouille "
 
 #: personal/ppolicy/class_ppolicyAccount.inc:92
 msgid "Locked permanently"
@@ -105,7 +105,7 @@ msgid "Locked accounts"
 msgstr "Comptes verrouillÃ©s "
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -114,14 +114,16 @@ 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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â€¯!"
+msgstr ""
+"La ppolicy \"%s\" pour l'utilisateur \"%s\" nâ€™a pas Ã©tÃ© trouvÃ©e dans le LDAP"
+"â€¯!"
 
 #: config/ppolicy/class_ppolicyConfig.inc:29
 msgid "Ppolicy plugin configuration"
-msgstr "Configuration du plugin Ppolicy"
+msgstr "Configuration de l'extension Ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:30
 msgid "FusionDirectory ppolicy plugin configuration"
@@ -133,7 +135,7 @@ msgstr "Plugin Ppolicy"
 
 #: config/ppolicy/class_ppolicyConfig.inc:46
 msgid "Ppolicy RDN"
-msgstr "Branche Ppolicy"
+msgstr "Ppolicy RDN"
 
 #: config/ppolicy/class_ppolicyConfig.inc:46
 msgid "Branch in which ppolicies will be stored"
@@ -145,7 +147,9 @@ msgstr "Cn de la politique par dÃ©faut"
 
 #: config/ppolicy/class_ppolicyConfig.inc:51
 msgid "What you put as default ppolicy in the overlay config"
-msgstr "Ce que vous mettez comme politique par dÃ©faut dans la configuration de l'overlay"
+msgstr ""
+"Ce que vous mettez comme politique par dÃ©faut dans la configuration de "
+"l'overlay"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
@@ -161,7 +165,7 @@ msgstr "Politiques de mot de passe pour l'overlay ppolicy"
 
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
-msgstr "Nom de la politique"
+msgstr "Nom de la politique de mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:60
 msgid "Description"
@@ -179,7 +183,9 @@ msgstr "Longueur minimale"
 msgid ""
 "Minimum length of the user supplied password - passwords shorter than this "
 "value will be rejected"
-msgstr "Longueur minimale du mot de passe fourni par l'utilisateur - les mots de passe plus courts que cette valeur seront rejetÃ©s"
+msgstr ""
+"Longueur minimale du mot de passe fourni par l'utilisateur - les mots de "
+"passe plus courts que cette valeur seront rejetÃ©es"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Passwords in history"
@@ -189,11 +195,13 @@ msgstr "Mots de passe dans lâ€™historique"
 msgid ""
 "Number of passwords that are maintained in a list of previously used "
 "passwords"
-msgstr "Nombre de mots de passe qui sont conservÃ©s dans une liste de mots de passe utilisÃ©s antÃ©rieurement"
+msgstr ""
+"Nombre de mots de passe qui sont maintenues dans une liste de mots de passe "
+"utilisÃ©s antÃ©rieurement"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum password age"
-msgstr "DurÃ©e de vie minimale du mot de passe"
+msgstr "Age minimum du mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum time between password changes"
@@ -201,14 +209,17 @@ msgstr "DÃ©lai minimum entre les changements de mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid "Maximum password age"
-msgstr "DurÃ©e de vie maximale du mot de passe"
+msgstr "DurÃ©e de vie du mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:79
 msgid ""
 "Maximum time a password is valid, after which it is deemed to be no longer "
 "usable and any bind operations attempted with the expired password will be "
 "treated as invalid"
-msgstr "Temps pendant lequel un mot de passe est valide, aprÃ¨s quoi il est rÃ©putÃ© ne plus Ãªtre utilisable et toutes les opÃ©rations de connexion tentÃ©es avec le mot de passe expirÃ© seront traitÃ©es comme invalides"
+msgstr ""
+"Temps maximum un mot de passe est valide, aprÃ¨s quoi il est rÃ©putÃ© ne plus "
+"Ãªtre utilisable et toutes les opÃ©rations de connexion tentÃ© avec le mot de "
+"passe expirÃ© seront traitÃ©s comme non valides"
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Expiry warning delay"
@@ -219,7 +230,10 @@ msgid ""
 "Defines the start time - in seconds - prior to the password expiry that "
 "password expiry warning messages are returned in bind responses. 0 to "
 "disable"
-msgstr "DÃ©finit l'heure de dÃ©but - en secondes - avant lâ€™expiration du mot passe qui retournera des messages d'avertissement d'expiration dans les rÃ©ponses de bind. 0 pour dÃ©sactiver"
+msgstr ""
+"DÃ©finit l'heure de dÃ©but - en secondes - avant lâ€™expiration du mot passe qui"
+" retournera des messages d'avertissement d'expiration dans les rÃ©ponses de "
+"bind. 0 pour dÃ©sactiver"
 
 #: admin/ppolicy/class_ppolicy.inc:89
 msgid "Grace period"
@@ -229,7 +243,9 @@ msgstr "PÃ©riode de grÃ¢ce "
 msgid ""
 "Number of times a user is allowed to successfully bind using an expired "
 "password"
-msgstr "Nombre de fois qu'un utilisateur est autorisÃ© Ã  se connecter avec succÃ¨s en utilisant un mot de passe expirÃ©"
+msgstr ""
+"Nombre de fois qu'un utilisateur est autorisÃ© Ã  se lier avec succÃ¨s en "
+"utilisant un mot de passe expirÃ©"
 
 #: admin/ppolicy/class_ppolicy.inc:94
 msgid "Allow user change"
@@ -237,7 +253,7 @@ msgstr "Autoriser le changement par l'utilisateur"
 
 #: admin/ppolicy/class_ppolicy.inc:94
 msgid "Whether users are allowed to change their own passwords"
-msgstr "Si les utilisateurs sont autorisÃ©s Ã  changer leur mot de passe ou non"
+msgstr "Si les utilisateurs sont autorisÃ©s Ã  changer leur mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:99
 msgid "Safe modify"
@@ -247,7 +263,9 @@ msgstr "Modification sure "
 msgid ""
 "Whether a user must send the current password during a password modification"
 " operation"
-msgstr "Si un utilisateur doit envoyer le mot de passe actuel pendant une opÃ©ration de modification de mot de passe ou non"
+msgstr ""
+"Si un utilisateur doit envoyer le mot de passe actuel pendant une opÃ©ration "
+"de modification de mot de passe"
 
 #: admin/ppolicy/class_ppolicy.inc:104
 msgid "Check quality"
@@ -255,7 +273,9 @@ msgstr "VÃ©rifier la qualitÃ©"
 
 #: admin/ppolicy/class_ppolicy.inc:104
 msgid "Decides what to do if the function in \"Check module\" is not available"
-msgstr "DÃ©cide ce qu'il faut faire si la fonction \"Check module\" n'est sont pas disponible"
+msgstr ""
+"DÃ©cide ce qu'il faut faire si la fonction \"Check module\" n'est sont pas "
+"disponible"
 
 #: admin/ppolicy/class_ppolicy.inc:107
 msgid "Disabled"
@@ -278,11 +298,14 @@ msgid ""
 "Name of a user supplied password quality check module that will be called to"
 " perform password quality checks and is only relevant if pwdCheckQuality is "
 "either 1 or 2"
-msgstr "Nom du module de contrÃ´le de qualitÃ© du mot de passe qui sera appelÃ© Ã  effectuer des contrÃ´les de qualitÃ© n'est pertinent que si pwdCheckQuality est 1 ou 2"
+msgstr ""
+"Nom du module de contrÃ´le de qualitÃ© du mot de passe qui sera appelÃ© Ã  "
+"effectuer des contrÃ´les de qualitÃ© n'est pertinent que si pwdCheckQuality "
+"est 1 ou 2"
 
 #: admin/ppolicy/class_ppolicy.inc:116
 msgid "Lock out"
-msgstr "Verrouillage"
+msgstr "verrouiller"
 
 #: admin/ppolicy/class_ppolicy.inc:120
 msgid "Activate lock out"
@@ -292,17 +315,22 @@ msgstr "Activer le verrouillage"
 msgid ""
 "Whether to lock an account that had more consecutive failed bind attempts "
 "with invalid passwords than is defined by \"Maximum failures\""
-msgstr "Faut-il verrouiller un compte qui avait plus dâ€™Ã©checs de connexion consÃ©cutifs avec des mots de passe incorrects que ce qui est dÃ©fini par Â«Nombre d'Ã©chec maximal\""
+msgstr ""
+"Faut-il verrouiller un compte qui avait plus dâ€™Ã©checs de connexion "
+"consÃ©cutifs avec des mots de passe incorrects que ce qui est dÃ©fini par "
+"Â«Nombre d'Ã©chec maximal\""
 
 #: admin/ppolicy/class_ppolicy.inc:125
 msgid "Lock out duration"
-msgstr "DurÃ©e de verrouillage "
+msgstr "La durÃ©e de verrouillage "
 
 #: admin/ppolicy/class_ppolicy.inc:125
 msgid ""
 "Time the account remains locked after an automatic lock out (0 means for "
 "ever)"
-msgstr "Temps que le compte reste bloquÃ© aprÃ¨s un verrouillage automatique sur (0 signifie pour toujours)"
+msgstr ""
+"Temps que le compte reste bloquÃ© aprÃ¨s un verrouillage automatique sur (0 "
+"signifie pour toujours)"
 
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid "Maximum failures"
@@ -311,7 +339,9 @@ msgstr "Nombre d'Ã©chec maximal"
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid ""
 "Number of consecutive password failures allowed before automatic lock out"
-msgstr "Nombre d'Ã©checs de mot de passe consÃ©cutifs autorisÃ©s avant verrouillage automatique"
+msgstr ""
+"Nombre d'Ã©checs de mot de passe consÃ©cutifs autorisÃ© avant Ã  verrouillage "
+"automatique"
 
 #: admin/ppolicy/class_ppolicy.inc:135
 msgid "Failure count interval"
@@ -321,7 +351,9 @@ msgstr "Intervalle de comptage dâ€™Ã©checs"
 msgid ""
 "Time after which the count of consecutive password failures is reset even if"
 " no successful authentication has occurred"
-msgstr "Temps au bout duquel le nombre d'Ã©checs de mot de passe consÃ©cutifs est rÃ©initialisÃ© mÃªme si aucune authentification rÃ©ussie a eu lieu"
+msgstr ""
+"Temps au bout duquel le nombre d'Ã©checs de mot de passe consÃ©cutifs est "
+"rÃ©initialisÃ© mÃªme si aucune authentification rÃ©ussie a eu lieu"
 
 #: admin/ppolicy/class_ppolicy.inc:140
 msgid "Must change"
@@ -331,12 +363,14 @@ msgstr "Doit changer"
 msgid ""
 "Whether the user must change their password after an account is reset by an "
 "administrator following an automatic lockout"
-msgstr "Si l'utilisateur doit changer son mot de passe aprÃ¨s qu'un compte aie Ã©tÃ© rÃ©initialisÃ© par un administrateur suite Ã  un verrouillage automatique"
+msgstr ""
+"Si l'utilisateur doit changer son mot de passe aprÃ¨s qu'un compte aie Ã©tÃ© "
+"rÃ©initialisÃ© par un administrateur suite Ã  un verrouillage automatique"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
-msgstr[0] "Il y a un compte verrouillÃ©"
+msgstr[0] "Il y a un compte verrouille"
 msgstr[1] "Il y a %1 comptes verrouillÃ©s"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
diff --git a/ppolicy/locale/hu_HU/fusiondirectory.po b/ppolicy/locale/hu_HU/fusiondirectory.po
index a98ecbef3af357ddf1ccb1e07b5241e8906139b2..80d96ddd52cc1470291395b40f30b44c75bec28c 100644
--- a/ppolicy/locale/hu_HU/fusiondirectory.po
+++ b/ppolicy/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 b67b4066cea7fba336f06b091cb725918886270c..e844a7e6fbc07926b13b6be28976a9b6618ea543 100644
--- a/ppolicy/locale/id/fusiondirectory.po
+++ b/ppolicy/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 3aa3864e73b7fface2f582410a2bc57c89d13945..293de5a4a6b3169e4b81fb79a16855a054551464 100644
--- a/ppolicy/locale/it_IT/fusiondirectory.po
+++ b/ppolicy/locale/it_IT/fusiondirectory.po
@@ -1,20 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:26+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +59,9 @@ msgstr "Ripristino di bloccaggio / forza le modifiche"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:59
 msgid "Resets the lock status of this account and/or force a password change"
-msgstr "Ripristina lo stato di blocco del conto e/o imponi una modifica della password"
+msgstr ""
+"Ripristina lo stato di blocco del conto e/o imponi una modifica della "
+"password"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:62
 msgid "Force password change (resets locking)"
@@ -106,7 +105,7 @@ msgid "Locked accounts"
 msgstr "Account bloccati"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
@@ -115,10 +114,12 @@ 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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!"
+msgstr ""
+"La ppolicy  \"%s\" impostata per l'utente  \"%s\"  non Ã© stata trovata "
+"nell'LDAP!"
 
 #: config/ppolicy/class_ppolicyConfig.inc:29
 msgid "Ppolicy plugin configuration"
@@ -146,7 +147,9 @@ msgstr "Cn di ppolicy predefinito"
 
 #: config/ppolicy/class_ppolicyConfig.inc:51
 msgid "What you put as default ppolicy in the overlay config"
-msgstr "CiÃ² che si mette come ppolicy default nella configurazione di sovrapposizione"
+msgstr ""
+"CiÃ² che si mette come ppolicy default nella configurazione di "
+"sovrapposizione"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
@@ -180,7 +183,9 @@ msgstr "Lunghezza minima"
 msgid ""
 "Minimum length of the user supplied password - passwords shorter than this "
 "value will be rejected"
-msgstr "Lunghezza minima della password utente - le password piÃ¹ brevi di questo valore verranno respinte"
+msgstr ""
+"Lunghezza minima della password utente - le password piÃ¹ brevi di questo "
+"valore verranno respinte"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Passwords in history"
@@ -190,7 +195,8 @@ msgstr "Cronologia delle password"
 msgid ""
 "Number of passwords that are maintained in a list of previously used "
 "passwords"
-msgstr "Numero di password mantenute in una lista di password usate precedentemente"
+msgstr ""
+"Numero di password mantenute in una lista di password usate precedentemente"
 
 #: admin/ppolicy/class_ppolicy.inc:74
 msgid "Minimum password age"
@@ -209,7 +215,10 @@ msgid ""
 "Maximum time a password is valid, after which it is deemed to be no longer "
 "usable and any bind operations attempted with the expired password will be "
 "treated as invalid"
-msgstr "Durata massima di validitÃ  di una password, dopo la quale si ritiene non essere piÃ¹ utilizzabile e le eventuali operazioni di associazione tentate con la password scaduta "
+msgstr ""
+"Durata massima di validitÃ  di una password, dopo la quale si ritiene non "
+"essere piÃ¹ utilizzabile e le eventuali operazioni di associazione tentate "
+"con la password scaduta "
 
 #: admin/ppolicy/class_ppolicy.inc:84
 msgid "Expiry warning delay"
@@ -220,7 +229,10 @@ msgid ""
 "Defines the start time - in seconds - prior to the password expiry that "
 "password expiry warning messages are returned in bind responses. 0 to "
 "disable"
-msgstr "Definire il tempo d'inizio - in secondi - prima della scadenza della password che i messaggi di avviso di scadenza della password vengono restituiti in risposta bind . 0 per disabilitare"
+msgstr ""
+"Definire il tempo d'inizio - in secondi - prima della scadenza della "
+"password che i messaggi di avviso di scadenza della password vengono "
+"restituiti in risposta bind . 0 per disabilitare"
 
 #: admin/ppolicy/class_ppolicy.inc:89
 msgid "Grace period"
@@ -230,7 +242,9 @@ msgstr "Periodo di grazia"
 msgid ""
 "Number of times a user is allowed to successfully bind using an expired "
 "password"
-msgstr "Numero di volte che un utente puÃ² associare con successo utilizzando una password scaduta"
+msgstr ""
+"Numero di volte che un utente puÃ² associare con successo utilizzando una "
+"password scaduta"
 
 #: admin/ppolicy/class_ppolicy.inc:94
 msgid "Allow user change"
@@ -248,7 +262,9 @@ msgstr "Modify sicuro"
 msgid ""
 "Whether a user must send the current password during a password modification"
 " operation"
-msgstr "Se un utente deve inviare la password attuale durante l'operazione di modifica della password"
+msgstr ""
+"Se un utente deve inviare la password attuale durante l'operazione di "
+"modifica della password"
 
 #: admin/ppolicy/class_ppolicy.inc:104
 msgid "Check quality"
@@ -279,7 +295,10 @@ msgid ""
 "Name of a user supplied password quality check module that will be called to"
 " perform password quality checks and is only relevant if pwdCheckQuality is "
 "either 1 or 2"
-msgstr "Nome di un modulo di controllo di qualitÃ  password utente fornito che verrÃ  chiamato a svolgere controlli di qualitÃ  delle password ed Ã¨ rilevante solo se pwdCheckQuality Ã¨ 1 o 2"
+msgstr ""
+"Nome di un modulo di controllo di qualitÃ  password utente fornito che verrÃ  "
+"chiamato a svolgere controlli di qualitÃ  delle password ed Ã¨ rilevante solo "
+"se pwdCheckQuality Ã¨ 1 o 2"
 
 #: admin/ppolicy/class_ppolicy.inc:116
 msgid "Lock out"
@@ -293,7 +312,9 @@ msgstr "Attiva blocco"
 msgid ""
 "Whether to lock an account that had more consecutive failed bind attempts "
 "with invalid passwords than is defined by \"Maximum failures\""
-msgstr "Sia per bloccare un account che aveva piÃ¹ tentativi consecutivi falliti di bind con password non valide che Ã¨ definito da \"fallimenti massimi\""
+msgstr ""
+"Sia per bloccare un account che aveva piÃ¹ tentativi consecutivi falliti di "
+"bind con password non valide che Ã¨ definito da \"fallimenti massimi\""
 
 #: admin/ppolicy/class_ppolicy.inc:125
 msgid "Lock out duration"
@@ -303,7 +324,9 @@ msgstr "Durata del blocco"
 msgid ""
 "Time the account remains locked after an automatic lock out (0 means for "
 "ever)"
-msgstr "Tempo in cui l'account rimane bloccato dopo un blocco automatico (0 significa per sempre)"
+msgstr ""
+"Tempo in cui l'account rimane bloccato dopo un blocco automatico (0 "
+"significa per sempre)"
 
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid "Maximum failures"
@@ -312,7 +335,8 @@ msgstr "Fallimenti massimi"
 #: admin/ppolicy/class_ppolicy.inc:130
 msgid ""
 "Number of consecutive password failures allowed before automatic lock out"
-msgstr "Numero di password sbagliate consecutivamente prima del blocco automatico"
+msgstr ""
+"Numero di password sbagliate consecutivamente prima del blocco automatico"
 
 #: admin/ppolicy/class_ppolicy.inc:135
 msgid "Failure count interval"
@@ -322,7 +346,9 @@ msgstr "Intervallo di conteggio fallito"
 msgid ""
 "Time after which the count of consecutive password failures is reset even if"
 " no successful authentication has occurred"
-msgstr "Tempo dopo il quale il numero di fallimenti di password consecutive viene azzerato anche se non ha subito alcuna autenticazione"
+msgstr ""
+"Tempo dopo il quale il numero di fallimenti di password consecutive viene "
+"azzerato anche se non ha subito alcuna autenticazione"
 
 #: admin/ppolicy/class_ppolicy.inc:140
 msgid "Must change"
@@ -332,13 +358,15 @@ msgstr "Permesso di cambiare"
 msgid ""
 "Whether the user must change their password after an account is reset by an "
 "administrator following an automatic lockout"
-msgstr "L'utente deve cambiare la propria password dopo il reset dell'account da parte di un amministratore in seguito ad un blocco automatico"
+msgstr ""
+"L'utente deve cambiare la propria password dopo il reset dell'account da "
+"parte di un amministratore in seguito ad un blocco automatico"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:2
 msgid "There is one locked account"
 msgid_plural "There are %1 locked accounts"
 msgstr[0] "C'Ã© un account bloccato"
-msgstr[1] "Ci sono %1 di accounts bloccati"
+msgstr[1] "Ci sono %1 accounts bloccati"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:5
 msgid "There is no locked account"
diff --git a/ppolicy/locale/lv/fusiondirectory.po b/ppolicy/locale/lv/fusiondirectory.po
index 409222cb10c8f3117fff00f6d686a40bb2d7010e..048a8443c571479a3fe2539fae6cce64de1ba2c4 100644
--- a/ppolicy/locale/lv/fusiondirectory.po
+++ b/ppolicy/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 618be033a4757bdce405a25fb20cb44cd7a4dfcd..694f60f0b28d1297263c0269894d0605235d9768 100644
--- a/ppolicy/locale/nb/fusiondirectory.po
+++ b/ppolicy/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 8d25eb816112b6dc9b0aac7cf0605cdcf36a6934..216c503561fae5c005f37eecbd9564be05fecf02 100644
--- a/ppolicy/locale/nl/fusiondirectory.po
+++ b/ppolicy/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,24 +22,24 @@ msgstr ""
 #: personal/ppolicy/class_ppolicyAccount.inc:44
 #: admin/ppolicy/class_ppolicy.inc:32 admin/ppolicy/class_ppolicy.inc:35
 msgid "Password policy"
-msgstr ""
+msgstr "Wachtwoord policy"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:30
 msgid "Edit user's password policy"
-msgstr ""
+msgstr "Bewerk de gebruikers wachtwoord policy"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:47
 #: admin/ppolicy/class_ppolicy.inc:51
 msgid "Policy"
-msgstr ""
+msgstr "Policy"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:47
 msgid "Use a specific policy for this user"
-msgstr ""
+msgstr "Gebruik een specifieke policy voor deze gebruiker"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:51
 msgid "Last password change"
-msgstr ""
+msgstr "Laatste wachtwoord is veranderd"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:51
 msgid "Last time the password for the entry was changed"
@@ -70,15 +71,15 @@ msgstr ""
 
 #: personal/ppolicy/class_ppolicyAccount.inc:77
 msgid "Use the default"
-msgstr ""
+msgstr "Gebruik de standaard"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:83
 msgid "Never"
-msgstr ""
+msgstr "Nooit"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:90
 msgid "Unlocked"
-msgstr ""
+msgstr "Niet geblokkeerd"
 
 #: personal/ppolicy/class_ppolicyAccount.inc:92
 msgid "Locked permanently"
@@ -94,7 +95,7 @@ msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:39
 msgid "Expired accounts"
-msgstr ""
+msgstr "Vervallen accounts"
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:44
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:8
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
@@ -111,7 +112,7 @@ msgstr "Configuratie fout"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, php-format
 msgid "Ppolicy \"%s\" set for user \"%s\" could not be found in the LDAP!"
 msgstr ""
@@ -146,7 +147,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicyManagement.inc:29
 msgid "Password policies"
-msgstr ""
+msgstr "Wachtwoord policies"
 
 #: admin/ppolicy/class_ppolicyManagement.inc:30
 msgid "Password policies management"
@@ -158,7 +159,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:56
 msgid "Policy name"
-msgstr ""
+msgstr "Naam van de policy"
 
 #: admin/ppolicy/class_ppolicy.inc:60
 msgid "Description"
@@ -170,7 +171,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:64
 msgid "Minimum length"
-msgstr ""
+msgstr "Minimum lengte"
 
 #: admin/ppolicy/class_ppolicy.inc:64
 msgid ""
@@ -180,7 +181,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid "Passwords in history"
-msgstr ""
+msgstr "Wachtwoord in de geschiedenis"
 
 #: admin/ppolicy/class_ppolicy.inc:69
 msgid ""
@@ -322,7 +323,7 @@ msgstr ""
 
 #: admin/ppolicy/class_ppolicy.inc:140
 msgid "Must change"
-msgstr ""
+msgstr "Moet veranderen"
 
 #: admin/ppolicy/class_ppolicy.inc:140
 msgid ""
@@ -350,7 +351,7 @@ msgstr "uid"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:17
 msgid "cn"
-msgstr ""
+msgstr "cn"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:20
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:32
@@ -363,8 +364,8 @@ msgstr ""
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:26
 msgid "manager"
-msgstr ""
+msgstr "Manager"
 
 #: addons/dashboard/ppolicy_locked_accounts.tpl.c:29
 msgid "mail"
-msgstr ""
+msgstr "E-mail"
diff --git a/ppolicy/locale/pl/fusiondirectory.po b/ppolicy/locale/pl/fusiondirectory.po
index ac75dd7f784d271775a632fafc734741b6ea9716..e75a1a9e8b8e690a8564352553b1cd77bd55ae1d 100644
--- a/ppolicy/locale/pl/fusiondirectory.po
+++ b/ppolicy/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
@@ -111,7 +112,7 @@ msgstr "BÅ‚Ä…d konfiguracji"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 5553e472a602139a1f075775bed4a93782418f62..e1f885b3be6c21bcac984a80c7348b93c9d226d6 100644
--- a/ppolicy/locale/pt/fusiondirectory.po
+++ b/ppolicy/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
@@ -111,7 +112,7 @@ msgstr "Erro de configuraÃ§Ã£o"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 d58714823781d487e48cf31d94880234ae1a627c..582ada22314ae92bb9f6f0b2d905870aa6c7865a 100644
--- a/ppolicy/locale/pt_BR/fusiondirectory.po
+++ b/ppolicy/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
@@ -111,7 +112,7 @@ msgstr "Erro de configuraÃ§Ã£o"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 9b01fc56ad958541aaab56b9820bea675ce3e1a6..9e782ea193f64cb6362859b218eda8162688d7be 100644
--- a/ppolicy/locale/ru/fusiondirectory.po
+++ b/ppolicy/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
@@ -111,7 +112,7 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 702e413a278d1d6e3f7620f7754759681acd40e5..6544265ee275805b0204ddb72cb7de511b07fcfa 100644
--- a/ppolicy/locale/ru@petr1708/fusiondirectory.po
+++ b/ppolicy/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 1fc287c9da47b2a1797a43cce12f43ed0cf620c5..47abacdfdead195af9ee653a2945f3cb58086cf3 100644
--- a/ppolicy/locale/sv/fusiondirectory.po
+++ b/ppolicy/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
@@ -111,7 +112,7 @@ msgstr "Konfigurationsfel"
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 4043c877f3dc856a1db12e82ce9d52bb1574ff05..00375aeebe753fcd825ac9fbe6953cc92fd49f23 100644
--- a/ppolicy/locale/ug/fusiondirectory.po
+++ b/ppolicy/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 b4c260d10e245718e5432c1e73d4c59eb57078fb..e38a279768941f047a5ba8b87c2a6b107ac05224 100644
--- a/ppolicy/locale/vi_VN/fusiondirectory.po
+++ b/ppolicy/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr "Lá»—i cáº¥u hÃ¬nh"
 
@@ -111,7 +112,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:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 a9463036b5055be0b6af67626db08653761b6e5e..577c98f5eb37bbd3ac9f687c6a914a4b9cfd9c2a 100644
--- a/ppolicy/locale/zh/fusiondirectory.po
+++ b/ppolicy/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +103,7 @@ msgid "Locked accounts"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardPPolicy.inc:71
-#: addons/dashboard/class_dashBoardPPolicy.inc:127
+#: addons/dashboard/class_dashBoardPPolicy.inc:124
 msgid "Configuration error"
 msgstr ""
 
@@ -111,7 +112,7 @@ msgstr ""
 msgid "Default ppolicy \"%s\" could not be found in the LDAP!"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardPPolicy.inc:128
+#: addons/dashboard/class_dashBoardPPolicy.inc:125
 #, 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 2f17a1d47c37a72ebbcb06b3fb119de5743d3061..5e4f4c46e734cf043ba8b565640e5166fbdf2941 100644
--- a/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
+++ b/ppolicy/personal/ppolicy/class_ppolicyAccount.inc
@@ -82,7 +82,7 @@ class ppolicyAccount extends simplePlugin
     if ($this->pwdChangedTime == '') {
       $this->pwdChangedTime = _('Never');
     } else {
-      $date = DateTime::createFromFormat('YmdHis\Z', $this->pwdChangedTime, new DateTimeZone('UTC'));
+      $date = LdapGeneralizedTime::fromString($this->pwdChangedTime);
       $date->setTimezone(timezone::getDefaultTimeZone());
       $this->pwdChangedTime = $date->format('Y-m-d H:i:s');
     }
@@ -91,7 +91,7 @@ class ppolicyAccount extends simplePlugin
     } elseif ($this->pwdAccountLockedTime == '000001010000Z') {
       $this->pwdAccountLockedTime = _('Locked permanently');
     } else {
-      $date = DateTime::createFromFormat('YmdHis\Z', $this->pwdAccountLockedTime, new DateTimeZone('UTC'));
+      $date = LdapGeneralizedTime::fromString($this->pwdAccountLockedTime);
       $date->setTimezone(timezone::getDefaultTimeZone());
       $this->pwdAccountLockedTime = $date->format('Y-m-d H:i:s');
     }
@@ -102,7 +102,6 @@ class ppolicyAccount extends simplePlugin
     global $config;
     if ($this->dn != 'new') {
       $ldap = $config->get_ldap_link();
-      $this->updateAttributesValues();
       $ldap->cat($this->dn, $this->attributes);
       $attrs = $ldap->fetch();
       $this->attrs = array_merge($this->attrs, $attrs);
diff --git a/puppet/admin/systems/puppet/class_puppetNode.inc b/puppet/admin/systems/puppet/class_puppetNode.inc
index 8b132f314759643730ba76835cc42f4b7df2375d..e51e3579d99bb8d81124fd6d928e5a8a7a7d42cc 100644
--- a/puppet/admin/systems/puppet/class_puppetNode.inc
+++ b/puppet/admin/systems/puppet/class_puppetNode.inc
@@ -27,6 +27,7 @@ class puppetNode extends simplePlugin
   static function getAttributesInfo ()
   {
     return array(
+      // Attributes are grouped by section
       'section1' => array(
         'name'  => _("Puppet node settings"),
         'attrs' => array(
@@ -43,11 +44,11 @@ class puppetNode extends simplePlugin
                 new StringAttribute ('',   _('Name of the variable'),   'puppetVar'),
                 new StringAttribute ('=',  _('Value of the variable'),  'puppetVarValue'),
               ),
-               /* sscanf format */
+               // sscanf format
               '%[^ =]=%[^ ]',
-              /* sprintf format  */
+              // sprintf format
               '%s=%s',
-              /* acl, empty string means we don't care (handle it automagically) */
+              // acl, empty string means we don't care (handle it automagically)
               '',
               'Puppet Vars'
             )
@@ -57,6 +58,7 @@ class puppetNode extends simplePlugin
     );
   }
 
+  // We also need this function that return some information about the plugin
   static function plInfo ()
   {
     return array(
@@ -64,6 +66,8 @@ class puppetNode extends simplePlugin
       "plDescription"     => _("Support for puppet schema in order to edit puppet classes and puppet vars"),
       "plSelfModify"      => FALSE,
       "plObjectType"      => array("server", "workstation"),
+
+      // But simplePlugin can generate the ACL list for us
       "plProvidedAcls"    => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
@@ -83,7 +87,6 @@ class puppetNode extends simplePlugin
     $this->attributesInfo['section1']['attrs']['parentNode']->setChoices($nodes);
     $ldap->search("(objectClass=puppetServer)", array('puppetAvailableEnvironment'));
     if ($ldap->count() == 0) {
-      /* TODO : Add something to simplePlugin to handle this case : the tab should not exist */
       $this->is_account = FALSE;
       return;
     }
@@ -91,6 +94,7 @@ class puppetNode extends simplePlugin
     $envs = $attrs['puppetAvailableEnvironment'];
     unset($envs['count']);
     $this->attributesInfo['section1']['attrs']['environment']->setChoices($envs);
+    //~ $this->attributesInfo['section1']['attrs']['puppetClass']->attribute->setChoices(array('class1','class2'));
   }
 }
 
diff --git a/puppet/locale/ar/fusiondirectory.po b/puppet/locale/ar/fusiondirectory.po
index 32a3829a8bf4150c1e566ad6b91521cf15f793a3..63f201955e84155c512d97ef3d53d9baea11d07b 100644
--- a/puppet/locale/ar/fusiondirectory.po
+++ b/puppet/locale/ar/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/ca/fusiondirectory.po b/puppet/locale/ca/fusiondirectory.po
index 074bc7a41308c3d1bbb633a0e697cd6b37917133..ba16c4dfa63080b6720481adbe93c924d6aace31 100644
--- a/puppet/locale/ca/fusiondirectory.po
+++ b/puppet/locale/ca/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/cs_CZ/fusiondirectory.po b/puppet/locale/cs_CZ/fusiondirectory.po
index 4487d97e78760e52960f6814556ea6dcaec35361..df11bbe91e891ec4c5de00f126e3972cdcd12c55 100644
--- a/puppet/locale/cs_CZ/fusiondirectory.po
+++ b/puppet/locale/cs_CZ/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "NastavenÃ Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "TÅ™Ãda Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "TÅ™Ãda Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
-msgstr "NadÅ™azenÃ½ uzel"
+msgstr "nadÅ™azenÃ½ uzel"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "NadÅ™azenÃ½ Puppet uzel"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
-msgstr "ProstÅ™edÃ"
+msgstr "prostÅ™edÃ"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "ProstÅ™edÃ Puppet uzlu"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "NastavenÃ promÄ›nnÃ© pro puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "NÃ¡zev promÄ›nnÃ©"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Hodnota promÄ›nnÃ©"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr "Podpora pro schÃ©ma puppet pro Ãºpravy puppet tÅ™Ãd a promÄ›nnÃ½ch"
diff --git a/puppet/locale/de/fusiondirectory.po b/puppet/locale/de/fusiondirectory.po
index 1f117702c3a435a9b0790ec3500a499a412d334f..fa4562ea28606ea85aa97cfe99e83652a77ec415 100644
--- a/puppet/locale/de/fusiondirectory.po
+++ b/puppet/locale/de/fusiondirectory.po
@@ -1,76 +1,78 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "Puppetknoteneinstellungen"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Puppet Klasse"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "Puttet Node Klasse"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "Parent-Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "Puppet Parent Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Umgebung"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "Puppet Node Umgebung"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "Eine Variableneinstellung fÃ¼r Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Name der Variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Wert der Variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "UnterstÃ¼tzung fÃ¼r puppet Schema um puppet Klassen und puppet vars zu bearbeiten"
+msgstr ""
+"UnterstÃ¼tzung fÃ¼r puppet Schema um puppet Klassen und puppet vars zu "
+"bearbeiten"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
 msgid "Puppet server"
-msgstr "Puppet-Server"
+msgstr "Puppet Server"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:29
 msgid "This service allows you to use a puppet server"
diff --git a/puppet/locale/el_GR/fusiondirectory.po b/puppet/locale/el_GR/fusiondirectory.po
index 654f8466b52614c5b61b49c5aa643d8adafe3064..dd96a12f6bc5a5cf5d56f6b2efd946a84390578f 100644
--- a/puppet/locale/el_GR/fusiondirectory.po
+++ b/puppet/locale/el_GR/fusiondirectory.po
@@ -1,72 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Puppet node"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "ÎšÎ»Î¬ÏƒÎ· Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "ÎšÎ»Î¬ÏƒÎ· Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
-msgstr "Î“Î¿Î½Î¹ÎºÏŒ node"
+msgstr "Î“Î¿Î½Î¹ÎºÏŒ Î½Î®Î¼Î±"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "Î“Î¿Î½Î¹ÎºÏŒ Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Î ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "Î ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½ Puppet Node"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "ÎœÎ¹Î± Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î® ÏÏÎ¸Î¼Î¹ÏƒÎ· Î³Î¹Î± Ï„Î¿ puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î®Ï‚"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Î¤Î¹Î¼Î® Ï„Î·Ï‚ Î¼ÎµÏ„Î±Î²Î»Î·Ï„Î®Ï‚"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "Î¥Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· Î³Î¹Î± ÏƒÏ‡Î®Î¼Î± puppet Î³Î¹Î± Ï„Î·Î½ ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÎºÎ»Î¬ÏƒÎµÏ‰Î½ puppet ÎºÎ±Î¹ puppet vars"
+msgstr ""
+"Î¥Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· Î³Î¹Î± ÏƒÏ‡Î®Î¼Î± puppet Î³Î¹Î± Ï„Î·Î½ ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÎºÎ»Î¬ÏƒÎµÏ‰Î½ puppet ÎºÎ±Î¹ puppet "
+"vars"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
@@ -75,7 +76,8 @@ msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:29
 msgid "This service allows you to use a puppet server"
-msgstr "Î‘Ï…Ï„Î® Î· Ï…Ï€Î·ÏÎµÏƒÎ¯Î± ÏƒÎ±Ï‚ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ ÎÎ½Î±Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® puppet"
+msgstr ""
+"Î‘Ï…Ï„Î® Î· Ï…Ï€Î·ÏÎµÏƒÎ¯Î± ÏƒÎ±Ï‚ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ ÎÎ½Î±Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:46
 msgid "Environments"
diff --git a/puppet/locale/en/fusiondirectory.po b/puppet/locale/en/fusiondirectory.po
index 15e4be8b490e1e223b00c2eb2c83ab5ff383ecb2..fa60c15162adc7ba9781bc017c2433a0764c0e71 100644
--- a/puppet/locale/en/fusiondirectory.po
+++ b/puppet/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,51 +17,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/es/fusiondirectory.po b/puppet/locale/es/fusiondirectory.po
index ac19d3d19d9674a611a99a58bbf66d7a151c50cb..c1ba8ec7c0c793281d03792c2a97605e48f9c949 100644
--- a/puppet/locale/es/fusiondirectory.po
+++ b/puppet/locale/es/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "Servidor Origen"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Entorno"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/es_CO/fusiondirectory.po b/puppet/locale/es_CO/fusiondirectory.po
index 6e6454c12f87ecadeb6366e903efe8c4e28f6d98..942afe8c1dc51c8d18a94010b54fbbb56d047806 100644
--- a/puppet/locale/es_CO/fusiondirectory.po
+++ b/puppet/locale/es_CO/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/es_VE/fusiondirectory.po b/puppet/locale/es_VE/fusiondirectory.po
index 6df232d37f2eefa9c74506fd397ffb2d3ced899b..71beedbf955fd559dd3cad9dc1bc370d6be09810 100644
--- a/puppet/locale/es_VE/fusiondirectory.po
+++ b/puppet/locale/es_VE/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "Opciones de nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Clase de Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "Clase del nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "Nodo padre"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "Nodo Puppet padre"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Entorno"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "Entorno de Nodo Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "Una configuraciÃ³n de variable para Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/fa_IR/fusiondirectory.po b/puppet/locale/fa_IR/fusiondirectory.po
index 037ff9ba94e378e654ea3b9c63f2a887c0469ac7..a17459284dc253a186132fa1cd7dd39e93878a60 100644
--- a/puppet/locale/fa_IR/fusiondirectory.po
+++ b/puppet/locale/fa_IR/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/fi_FI/fusiondirectory.po b/puppet/locale/fi_FI/fusiondirectory.po
index 4aa0695856c41fea87d3b6c593be488f1d3e4bda..0d7bbbb004d506f40439068438cb248f3d2a69ba 100644
--- a/puppet/locale/fi_FI/fusiondirectory.po
+++ b/puppet/locale/fi_FI/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/fr/fusiondirectory.po b/puppet/locale/fr/fusiondirectory.po
index 3af817841ac863b2fc9d4f461de151be003ef69c..5c3d41a0fa6afcaa8157f394fb9adfcc29d6ab75 100644
--- a/puppet/locale/fr/fusiondirectory.po
+++ b/puppet/locale/fr/fusiondirectory.po
@@ -1,71 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
-msgstr "ParamÃ¨tres de nÅ“ud Puppet"
+msgstr "ParamÃ¨tres des noeuds"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Classe Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
-msgstr "Classe de nÅ“ud Puppet"
+msgstr "Class de noeuds Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
-msgstr "NÅ“ud parent"
+msgstr "Noeud PÃ¨re"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
-msgstr "NÅ“ud Puppet parent"
+msgstr "Noeud Parent"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Environnement"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
-msgstr "Environnement de nÅ“ud Puppet"
+msgstr "Environnement nÅ“ud de Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
-msgstr "Un paramÃ¨tre variable pour puppet"
+msgstr "un paramÃ¨tre variable pour puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Nom de la variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Valeur de la variable"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "Support du schÃ©ma Puppet afin de modifier les classes et les variables Puppet"
+msgstr ""
+"Soutien pour le schÃ©ma Puppet afin de modifier les classes Puppet et les "
+"variables Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
@@ -74,12 +76,12 @@ msgstr "Serveur Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:29
 msgid "This service allows you to use a puppet server"
-msgstr "Ce service permet d'utiliser un serveur Puppet"
+msgstr "Ce service vous permet d'utiliser un serveur Puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:46
 msgid "Environments"
-msgstr "Environnements"
+msgstr "Environments"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:47
 msgid "Available environments for puppet nodes"
-msgstr "Environnements disponibles pour les nÅ“uds Puppet"
+msgstr "Environnements disponibles pour les noeuds Puppet"
diff --git a/puppet/locale/hu_HU/fusiondirectory.po b/puppet/locale/hu_HU/fusiondirectory.po
index 688642bc5db4e94d2e2126f1b9987c7f853856b9..b079404859b7c6aa791d539bc3b2d3a92a440360 100644
--- a/puppet/locale/hu_HU/fusiondirectory.po
+++ b/puppet/locale/hu_HU/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/id/fusiondirectory.po b/puppet/locale/id/fusiondirectory.po
index e451e2f114c23f0528ef78e9d50d057d248bf49a..02908f54f97994d994c75b7b0654c9ffa69e2a48 100644
--- a/puppet/locale/id/fusiondirectory.po
+++ b/puppet/locale/id/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/it_IT/fusiondirectory.po b/puppet/locale/it_IT/fusiondirectory.po
index f1d6a734cfd6a482e5c63713e3af403e80854954..cbcbbee83c21b5cde0e1492e0521dd311891d3a0 100644
--- a/puppet/locale/it_IT/fusiondirectory.po
+++ b/puppet/locale/it_IT/fusiondirectory.po
@@ -1,73 +1,73 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "Impostazioni del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Classe puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "Classe del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "Nodo genitore"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "Nodo genitore Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "Ambiente del nodo puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "Impostazione di una variabile di Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Nome della variabile"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Valore della variabile"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "Supporto per lo schema di puppet, al fine di modificare le classi e le variabili di puppet"
+msgstr ""
+"Supporto per lo schema di puppet, al fine di modificare le classi e le "
+"variabili di puppet"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
diff --git a/puppet/locale/lv/fusiondirectory.po b/puppet/locale/lv/fusiondirectory.po
index 4a13e62815e47a9b0dff03f5da71c713c1213827..debe0fc51d75b828a7a63f2b1ac2c82966e0363b 100644
--- a/puppet/locale/lv/fusiondirectory.po
+++ b/puppet/locale/lv/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/nb/fusiondirectory.po b/puppet/locale/nb/fusiondirectory.po
index a7c06a51cff84af3a266e6c008917495f6458c03..6923558df4081cbc609fe24cd10644a7e27fedf3 100644
--- a/puppet/locale/nb/fusiondirectory.po
+++ b/puppet/locale/nb/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/nl/fusiondirectory.po b/puppet/locale/nl/fusiondirectory.po
index e85fbd990fe3ec63fc9e6e0ac7dfb49dce51148b..65e458c7a499ad3bc63759639a762242706e554d 100644
--- a/puppet/locale/nl/fusiondirectory.po
+++ b/puppet/locale/nl/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "Parent node"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Omgeving"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
-msgstr ""
+msgstr "Naam van de variabele"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
-msgstr ""
+msgstr "Waarde van de variabele"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
@@ -77,7 +78,7 @@ msgstr ""
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:46
 msgid "Environments"
-msgstr ""
+msgstr "Omgevingen"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:47
 msgid "Available environments for puppet nodes"
diff --git a/puppet/locale/pl/fusiondirectory.po b/puppet/locale/pl/fusiondirectory.po
index 9f006754497328ad444e917cffbf41ff560cf941..32708dd490707e3e7fc353d04df3b2d93b49d1e5 100644
--- a/puppet/locale/pl/fusiondirectory.po
+++ b/puppet/locale/pl/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Åšrodowisko"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/pt/fusiondirectory.po b/puppet/locale/pt/fusiondirectory.po
index ad8d792ce3e4f692bbbb91ed8568ffbef2bd9f0a..10f1f3d4ad0d6028b2330649be05b5977402d930 100644
--- a/puppet/locale/pt/fusiondirectory.po
+++ b/puppet/locale/pt/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/pt_BR/fusiondirectory.po b/puppet/locale/pt_BR/fusiondirectory.po
index 478cd5ddeb86c8b2824b3a839642b303856f561b..be3b9d9b72b9a4af5a2f38a565117700766e04f5 100644
--- a/puppet/locale/pt_BR/fusiondirectory.po
+++ b/puppet/locale/pt_BR/fusiondirectory.po
@@ -1,70 +1,72 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "ConfiguraÃ§Ãµes do nÃ³ do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Classe do Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "Classe do nÃ³ do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "NÃ³ pai"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "NÃ³ pai do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "Ambiente"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "NÃ³ ambiente do puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "ConfiguraÃ§Ã£o da variÃ¡vel para o puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Nome da variÃ¡vel"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "Valor da variÃ¡vel"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "Suporte para esquema puppet para editar as classes de puppet e puppet vars"
+msgstr ""
+"Suporte para esquema puppet para editar as classes de puppet e puppet vars"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
diff --git a/puppet/locale/ru/fusiondirectory.po b/puppet/locale/ru/fusiondirectory.po
index aa66b8921c7088b61264199553581f581543733a..771c59d317b5f1bc85ddcd87b1b0da2a09685ffc 100644
--- a/puppet/locale/ru/fusiondirectory.po
+++ b/puppet/locale/ru/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "ÐžÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/ru@petr1708/fusiondirectory.po b/puppet/locale/ru@petr1708/fusiondirectory.po
index 10a80e3fdd54f6395fec520218e97365b4e68d22..e3425bbe2d44ebc722c1bbb9912ff8b7a8eb97b7 100644
--- a/puppet/locale/ru@petr1708/fusiondirectory.po
+++ b/puppet/locale/ru@petr1708/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/sv/fusiondirectory.po b/puppet/locale/sv/fusiondirectory.po
index a3c7a4d94f98dc7c8a5d83c131b7565ac5100c32..ed985654b1fc6c139ad5cd7f447ffc270330e8c8 100644
--- a/puppet/locale/sv/fusiondirectory.po
+++ b/puppet/locale/sv/fusiondirectory.po
@@ -1,70 +1,72 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr "Puppet nodinstÃ¤llningar"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr "Puppet klass"
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr "Puppet Nodklass"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr "FÃ¶rÃ¤ldranod"
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr "Puppet fÃ¶rÃ¤ldranod"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "MiljÃ¶"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr "Puppet NodmiljÃ¶"
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr "En variabelinstÃ¤llning fÃ¶r puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr "Namn pÃ¥ variabeln"
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr "VÃ¤rde pÃ¥ variabeln"
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr "Puppet"
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
-msgstr "StÃ¶d fÃ¶r puppetschema fÃ¶r att redigera puppet-klasser och puppet-variabler"
+msgstr ""
+"StÃ¶d fÃ¶r puppetschema fÃ¶r att redigera puppet-klasser och puppet-variabler"
 
 #: admin/systems/services/puppet/class_servicePuppet.inc:28
 #: admin/systems/services/puppet/class_servicePuppet.inc:42
diff --git a/puppet/locale/ug/fusiondirectory.po b/puppet/locale/ug/fusiondirectory.po
index 19adc965b8ddc34daf55e22be6bc2573b52be074..3f41f4d45a8d067bf8f3cfd96b6ab2660b12a786 100644
--- a/puppet/locale/ug/fusiondirectory.po
+++ b/puppet/locale/ug/fusiondirectory.po
@@ -1,67 +1,67 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/vi_VN/fusiondirectory.po b/puppet/locale/vi_VN/fusiondirectory.po
index 5333eb9975801dfaba77a0717c83923beccb2562..22ff195dc3d502841822dd95b837dec8a3319d57 100644
--- a/puppet/locale/vi_VN/fusiondirectory.po
+++ b/puppet/locale/vi_VN/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "MÃ´i trÆ°á»ng"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/puppet/locale/zh/fusiondirectory.po b/puppet/locale/zh/fusiondirectory.po
index ea4d8a7c3ded19ecb273e94674a59d4f19fe6998..f03af0efc203c9e1f874dbe49841c75599335c7f 100644
--- a/puppet/locale/zh/fusiondirectory.po
+++ b/puppet/locale/zh/fusiondirectory.po
@@ -1,67 +1,68 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin/systems/puppet/class_puppetNode.inc:31
+#: admin/systems/puppet/class_puppetNode.inc:32
 msgid "Puppet node settings"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:34
+#: admin/systems/puppet/class_puppetNode.inc:35
 msgid "Puppet Node Class"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Parent node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:36
+#: admin/systems/puppet/class_puppetNode.inc:37
 msgid "Puppet Parent Node"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Environment"
 msgstr "çŽ¯å¢ƒè®¾ç½®"
 
-#: admin/systems/puppet/class_puppetNode.inc:37
+#: admin/systems/puppet/class_puppetNode.inc:38
 msgid "Puppet Node Environment"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:40
+#: admin/systems/puppet/class_puppetNode.inc:41
 msgid "A variable setting for puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:43
+#: admin/systems/puppet/class_puppetNode.inc:44
 msgid "Name of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:44
+#: admin/systems/puppet/class_puppetNode.inc:45
 msgid "Value of the variable"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:63
+#: admin/systems/puppet/class_puppetNode.inc:65
 msgid "Puppet"
 msgstr ""
 
-#: admin/systems/puppet/class_puppetNode.inc:64
+#: admin/systems/puppet/class_puppetNode.inc:66
 msgid ""
 "Support for puppet schema in order to edit puppet classes and puppet vars"
 msgstr ""
diff --git a/pureftpd/locale/ar/fusiondirectory.po b/pureftpd/locale/ar/fusiondirectory.po
index a20e056679e769b98a29a394189b440eb93d761a..ba9c270e3e4ac574de6b1da73c2f422d7f49ff0c 100644
--- a/pureftpd/locale/ar/fusiondirectory.po
+++ b/pureftpd/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/ca/fusiondirectory.po b/pureftpd/locale/ca/fusiondirectory.po
index 72e724978f1a150046e8a0df16a16773f94ddf21..a1f29fd98a0079f5c3b40774f07079d8941ab306 100644
--- a/pureftpd/locale/ca/fusiondirectory.po
+++ b/pureftpd/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/cs_CZ/fusiondirectory.po b/pureftpd/locale/cs_CZ/fusiondirectory.po
index 554c6b277e198eff5858dfc6a743f1073ab0fe46..8982c3117c593eaa3df24b40c5b7c2ad327d7896 100644
--- a/pureftpd/locale/cs_CZ/fusiondirectory.po
+++ b/pureftpd/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,20 +24,20 @@ msgstr "FTP"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Pure ftp account"
-msgstr "ÃšÄet pro PureFTP server"
+msgstr "ÃºÄet v PureFTP"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:34
 msgid "Connectivity addon"
-msgstr "DoplnÄ›k â€žostatnÃ sÃÅ¥ovÃ© sluÅ¾byâ€œ"
+msgstr "doplnÄ›k â€žostatnÃ sÃÅ¥ovÃ© sluÅ¾byâ€œ"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:49
 msgid "Bandwidth"
-msgstr "PÅ™enosovÃ¡ rychlost"
+msgstr "rychlost"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:53
 msgid "Upload bandwidth"
-msgstr "Rychlost odesÃlÃ¡nÃ"
+msgstr "rychlost nahrÃ¡vÃ¡nÃ"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:61
@@ -46,7 +46,7 @@ msgstr "(kb/s)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid "Download bandwidth"
-msgstr "Rychlost stahovÃ¡nÃ"
+msgstr "rychlost stahovÃ¡nÃ"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth in kb/sec"
@@ -54,7 +54,7 @@ msgstr "Rychlost stahovÃ¡nÃ v kb/s"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:72
 msgid "Ratio"
-msgstr "PomÄ›r"
+msgstr "pomÄ›r"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
@@ -68,15 +68,15 @@ msgstr "StaÅ¾enÃ© soubory"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:98
 msgid "Files"
-msgstr "Soubory"
+msgstr "souborÅ¯"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Quota files"
-msgstr "OmezovÃ¡nÃ poÄtu souborÅ¯"
+msgstr "omezenÃ poÄtu souborÅ¯"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:107
 msgid "Size"
-msgstr "Velikost"
+msgstr "velikost"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:107
 msgid " (MB)"
@@ -88,7 +88,7 @@ msgstr "Velikost souborÅ¯"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:118
 msgid "Miscellaneous"
-msgstr "RÅ¯znÃ©"
+msgstr "rÅ¯znÃ©"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:121
 msgid "Enable FTP access"
diff --git a/pureftpd/locale/de/fusiondirectory.po b/pureftpd/locale/de/fusiondirectory.po
index 876416659a81e3a02df60fe7e3fed7c221a1c7a9..069630de8384720c24722e7094dc2aadaa4609f8 100644
--- a/pureftpd/locale/de/fusiondirectory.po
+++ b/pureftpd/locale/de/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/el_GR/fusiondirectory.po b/pureftpd/locale/el_GR/fusiondirectory.po
index df68afd967fa76a5d4043a20dc4839f6a3121c11..68c1c39f04e59dd8b95a693cc5bb9bd2020f526c 100644
--- a/pureftpd/locale/el_GR/fusiondirectory.po
+++ b/pureftpd/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/en/fusiondirectory.po b/pureftpd/locale/en/fusiondirectory.po
index 522b0b5b348c2e0814afe43bf6fb65b68f925d22..e1e36799dbab92862e3b9ec8784ad9511cdd144a 100644
--- a/pureftpd/locale/en/fusiondirectory.po
+++ b/pureftpd/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/pureftpd/locale/es/fusiondirectory.po b/pureftpd/locale/es/fusiondirectory.po
index 78a32e8b74e7a7b5d83f914c9116cb75e5a82c96..615f94f90cbfaa3064145bab2baec093a3d7f931 100644
--- a/pureftpd/locale/es/fusiondirectory.po
+++ b/pureftpd/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/es_CO/fusiondirectory.po b/pureftpd/locale/es_CO/fusiondirectory.po
index bfee0d8b4553102fa6cbd62906de75b5b8189f94..420cafcda4ff3a334f1685784cf81b148bbabfc0 100644
--- a/pureftpd/locale/es_CO/fusiondirectory.po
+++ b/pureftpd/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/es_VE/fusiondirectory.po b/pureftpd/locale/es_VE/fusiondirectory.po
index 41f0015657dcb066cd59f23a851f91e1a548ab16..c7745613ee4200895efaea51dc7c1ff6132df5ec 100644
--- a/pureftpd/locale/es_VE/fusiondirectory.po
+++ b/pureftpd/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/fa_IR/fusiondirectory.po b/pureftpd/locale/fa_IR/fusiondirectory.po
index e2bd27c5d009acfc3b92b2021b5d47dc34218611..ad7423eb9181598c0bacd93f4ded1fbfe902f990 100644
--- a/pureftpd/locale/fa_IR/fusiondirectory.po
+++ b/pureftpd/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/fi_FI/fusiondirectory.po b/pureftpd/locale/fi_FI/fusiondirectory.po
index fe45c78deacf1162d1b0cc092f29a15afa741dff..aea76daf86a77f91b32e32846dd3a81d994f64a8 100644
--- a/pureftpd/locale/fi_FI/fusiondirectory.po
+++ b/pureftpd/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/fr/fusiondirectory.po b/pureftpd/locale/fr/fusiondirectory.po
index 87d117926e2a36d666e04c617b20fa635486ffe8..5f9dbe5cbd19bed2d1ef57e17b5054299b7a6f1f 100644
--- a/pureftpd/locale/fr/fusiondirectory.po
+++ b/pureftpd/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgstr "Bande passante montante"
 #: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid " (kb/sec)"
-msgstr "(Kb/sec)"
+msgstr "(kb/sec)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid "Download bandwidth"
@@ -50,7 +50,7 @@ msgstr "Bande passante descendante"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth in kb/sec"
-msgstr "Bande passante descendante en Kb/sec"
+msgstr "Bande passante descendante"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:72
 msgid "Ratio"
@@ -59,12 +59,12 @@ msgstr "Ratio"
 #: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
 msgid "Uploaded files"
-msgstr "DonnÃ©es envoyÃ©es"
+msgstr "DonnÃ©es envoyÃ©es / reÃ§ues"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
 msgid "Downloaded files"
-msgstr "DonnÃ©es reÃ§ues"
+msgstr "DonnÃ©es envoyÃ©es / reÃ§ues"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:98
 msgid "Files"
@@ -72,7 +72,7 @@ msgstr "Fichiers"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:99
 msgid "Quota files"
-msgstr "Quota pour les fichiers"
+msgstr "Taille du Quota pour les fichiers"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:107
 msgid "Size"
@@ -80,7 +80,7 @@ msgstr "Taille"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:107
 msgid " (MB)"
-msgstr " (Mo)"
+msgstr " (MB)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Files size"
@@ -92,8 +92,8 @@ msgstr "Divers"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:121
 msgid "Enable FTP access"
-msgstr "Activer l'accÃ¨s FTP"
+msgstr "Activer le service FTP"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:121
 msgid "Enable or disable FTP access"
-msgstr "Activer ou dÃ©sactiver temporairement l'accÃ¨s FTP"
+msgstr "Activer ou dÃ©sactiver le service FTP"
diff --git a/pureftpd/locale/hu_HU/fusiondirectory.po b/pureftpd/locale/hu_HU/fusiondirectory.po
index 68e0f00f2f3842ec3dcdbbd49904664b83a7c493..5c77e55b9889427ad3cd2a7cc95b5855f7a464c8 100644
--- a/pureftpd/locale/hu_HU/fusiondirectory.po
+++ b/pureftpd/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/id/fusiondirectory.po b/pureftpd/locale/id/fusiondirectory.po
index 1ce7ef71cc0ac47df6f219093a5fe7d7f66795b6..f5b3d982998ac5dd0d4ecb73cf82c88602dd47f0 100644
--- a/pureftpd/locale/id/fusiondirectory.po
+++ b/pureftpd/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/it_IT/fusiondirectory.po b/pureftpd/locale/it_IT/fusiondirectory.po
index a9fd77a9c148e93e9cd0699386c67625d51b0bd0..98ecfd7c1c969ce22aa53f64bda329e11669497c 100644
--- a/pureftpd/locale/it_IT/fusiondirectory.po
+++ b/pureftpd/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/lv/fusiondirectory.po b/pureftpd/locale/lv/fusiondirectory.po
index d096f875581585ea768fd4f6968af07ca51f677a..c31588b4b149d00cb69776f779d40e76ba448d2a 100644
--- a/pureftpd/locale/lv/fusiondirectory.po
+++ b/pureftpd/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/nb/fusiondirectory.po b/pureftpd/locale/nb/fusiondirectory.po
index c40a8deee57237ae48c765c3525368093196500c..b5af4b35b11abbff4d4f9e24a07abb4e57cbf346 100644
--- a/pureftpd/locale/nb/fusiondirectory.po
+++ b/pureftpd/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/nl/fusiondirectory.po b/pureftpd/locale/nl/fusiondirectory.po
index 1070da19e1d9e559f115ad0e57a6c883ded0d4d6..bfeed3337710202e92685ea041324b8a4a907e83 100644
--- a/pureftpd/locale/nl/fusiondirectory.po
+++ b/pureftpd/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,7 +42,7 @@ msgstr "Verstuur bandbreedte"
 #: personal/pureftpd/class_pureftpdAccount.inc:52
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid " (kb/sec)"
-msgstr ""
+msgstr "(kb/sec)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid "Download bandwidth"
@@ -58,12 +59,12 @@ msgstr "Verhouding"
 #: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
 msgid "Uploaded files"
-msgstr ""
+msgstr "GeÃ¼ploade bestanden"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:84
 #: personal/pureftpd/class_pureftpdAccount.inc:85
 msgid "Downloaded files"
-msgstr ""
+msgstr "Gedownloade bestanden"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:98
 msgid "Files"
@@ -79,11 +80,11 @@ msgstr "Grootte"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:107
 msgid " (MB)"
-msgstr ""
+msgstr "(MB)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:108
 msgid "Files size"
-msgstr ""
+msgstr "Bestandsgrootte"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:118
 msgid "Miscellaneous"
diff --git a/pureftpd/locale/pl/fusiondirectory.po b/pureftpd/locale/pl/fusiondirectory.po
index 1e458dfe6403e6708a9482855dd262b8e380cc3e..f47290a6d58f4b0c48d6b917a1403f118d4cb677 100644
--- a/pureftpd/locale/pl/fusiondirectory.po
+++ b/pureftpd/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/pt/fusiondirectory.po b/pureftpd/locale/pt/fusiondirectory.po
index 4faef69bb5979a37f8526bf1c34ec5d62fa08d86..0dd8b136dd3952ce0fd1d3e8293cf5ade3af617e 100644
--- a/pureftpd/locale/pt/fusiondirectory.po
+++ b/pureftpd/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/pt_BR/fusiondirectory.po b/pureftpd/locale/pt_BR/fusiondirectory.po
index c30d01da5faccddbe417f218b384b83fd6ce2f0e..385fbbcfdafacb2efa33ef2a20c92a8bd85a67d0 100644
--- a/pureftpd/locale/pt_BR/fusiondirectory.po
+++ b/pureftpd/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/ru/fusiondirectory.po b/pureftpd/locale/ru/fusiondirectory.po
index 1002c54a40b5d1e3b807e60fcb92640b04b0264b..ccc5b1dabd2d77ce40c061aa6e00b803fa90c902 100644
--- a/pureftpd/locale/ru/fusiondirectory.po
+++ b/pureftpd/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +46,7 @@ msgstr " (ÐºÐ±/ÑÐµÐº)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:61
 msgid "Download bandwidth"
-msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ (Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð°)"
+msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ (Ñ ÑÐµÑ€Ð²ÐµÑ€Ð°)"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:62
 msgid "Download bandwidth in kb/sec"
@@ -55,7 +54,7 @@ msgstr "ÐŸÑ€Ð¾Ð¿ÑƒÑÐºÐ½Ð°Ñ ÑÐ¿Ð¾ÑÐ¾Ð±Ð½Ð¾ÑÑ‚ÑŒ Ð½Ð° ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð²
 
 #: personal/pureftpd/class_pureftpdAccount.inc:72
 msgid "Ratio"
-msgstr "Ð¡Ð¾Ð¾Ñ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ðµ"
+msgstr "ÐžÑ‚Ð½Ð¾ÑˆÐµÐ½Ð¸Ðµ"
 
 #: personal/pureftpd/class_pureftpdAccount.inc:75
 #: personal/pureftpd/class_pureftpdAccount.inc:76
diff --git a/pureftpd/locale/ru@petr1708/fusiondirectory.po b/pureftpd/locale/ru@petr1708/fusiondirectory.po
index c3e90cfe94b351b873a034815806077e6ae9c2fd..890819083aeca2ae3228bbb6435ce94dcdbf6a9e 100644
--- a/pureftpd/locale/ru@petr1708/fusiondirectory.po
+++ b/pureftpd/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/sv/fusiondirectory.po b/pureftpd/locale/sv/fusiondirectory.po
index d543a8ca175e1fa8230cf8b898914c8863d1ceba..a2b918cc4ffe751b8822224878f0fe5df9c58021 100644
--- a/pureftpd/locale/sv/fusiondirectory.po
+++ b/pureftpd/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/ug/fusiondirectory.po b/pureftpd/locale/ug/fusiondirectory.po
index e4a230c1653178909c3fb6a2868899ff5d1e5a99..24d84954cf5f131a030436f7931211f69c030b53 100644
--- a/pureftpd/locale/ug/fusiondirectory.po
+++ b/pureftpd/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/vi_VN/fusiondirectory.po b/pureftpd/locale/vi_VN/fusiondirectory.po
index d32c8f157b453e6318164a1e518fc0f5c0baf495..933a1107ca08eb7011145de994478ce210f7913c 100644
--- a/pureftpd/locale/vi_VN/fusiondirectory.po
+++ b/pureftpd/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/pureftpd/locale/zh/fusiondirectory.po b/pureftpd/locale/zh/fusiondirectory.po
index 41bd18eeabd6050c1fc892b0a61f60448613352c..500f956506785fc62b797bd9358b1b228972c24d 100644
--- a/pureftpd/locale/zh/fusiondirectory.po
+++ b/pureftpd/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/quota/admin/systems/services/quota/class_serviceQuota.inc b/quota/admin/systems/services/quota/class_serviceQuota.inc
index 9d16ec36e227eb14004434979ea445046644e075..8b20a19129956488e70135c820afa6b3310b8117 100644
--- a/quota/admin/systems/services/quota/class_serviceQuota.inc
+++ b/quota/admin/systems/services/quota/class_serviceQuota.inc
@@ -53,9 +53,9 @@ class serviceQuota extends simpleService
                 new IntAttribute(
                   _('Quota block size'), _('Quota block size on this share (usually 1024)'),
                   'quotaBlockSize', TRUE,
-                  /*min*/
+                  // min
                   1,
-                  /*no max*/
+                  // no max
                   FALSE,
                   1024
                 ),
@@ -66,8 +66,10 @@ class serviceQuota extends simpleService
               ),
               ':'
             ),
+            // no order
             FALSE,
             array(),
+            // edit button
             TRUE
           )
         )
diff --git a/quota/locale/ar/fusiondirectory.po b/quota/locale/ar/fusiondirectory.po
index a3ab1ebdd917a71a69dd74af8aaa8f79c3cafdaf..c3b0c582bf0bf200b212487e86469032c4d4283a 100644
--- a/quota/locale/ar/fusiondirectory.po
+++ b/quota/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ca/fusiondirectory.po b/quota/locale/ca/fusiondirectory.po
index 9cf8f68c69e0d7c3d0690706075beced7f98f8d7..01d951206cfca42c3b95b17783e448d1a1412832 100644
--- a/quota/locale/ca/fusiondirectory.po
+++ b/quota/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "AvÃs"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/cs_CZ/fusiondirectory.po b/quota/locale/cs_CZ/fusiondirectory.po
index dc21ff6673517f1ded2f6db89d04386a64dfb6b9..2ab53c3a54316593e11753309432590019fc3fe5 100644
--- a/quota/locale/cs_CZ/fusiondirectory.po
+++ b/quota/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: personal/quota/class_quotaAccount.inc:101
 msgid "Quota"
-msgstr "KvÃ³ta"
+msgstr "kvÃ³ta"
 
 #: personal/quota/class_quotaAccount.inc:102
 msgid "Plugin for quota support"
@@ -36,64 +37,68 @@ msgstr ""
 #: personal/quota/class_quotaAccount.inc:129
 #: admin/systems/services/quota/class_serviceQuota.inc:50
 msgid "Device"
-msgstr "ZaÅ™ÃzenÃ"
+msgstr "zaÅ™ÃzenÃ"
 
 #: personal/quota/class_quotaAccount.inc:129
 msgid "Device this quota is for"
-msgstr "ZaÅ™ÃzenÃ, kterÃ©ho se tato kvÃ³ta tÃ½kÃ¡"
+msgstr "ZaÅ™ÃzenÃ, pro kterÃ© je tato kvÃ³ta urÄena"
 
 #: personal/quota/class_quotaAccount.inc:133
 msgid "Block soft limit"
-msgstr "Hranice varovÃ¡nÃ blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty poÄtu zabranÃ½ch blokÅ¯"
+msgstr "varovnÃ½ (â€žmÄ›kkÃ½â€œ) limit poÄtu zabranÃ½ch blokÅ¯"
 
 #: personal/quota/class_quotaAccount.inc:133
 msgid "Soft limit for the block the user can use"
-msgstr "Hranice varovÃ¡nÃ blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty blokÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
+msgstr ""
+"Hranice varovÃ¡nÃ blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty blokÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e "
+"vyuÅ¾Ãt"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
-msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu zabranÃ½ch blokÅ¯"
+msgstr "nepÅ™ekroÄitelnÃ½ (â€žtvrdÃ½â€œ) limit poÄtu zabranÃ½ch blokÅ¯"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu blokÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "varovnÃ½ (â€žmÄ›kkÃ½â€œ) limit poÄtu souborÅ¯ a sloÅ¾ek (i-uzlÅ¯)"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
-msgstr "Hranice varovÃ¡nÃ blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty i-uzlÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
+msgstr ""
+"Hranice varovÃ¡nÃ blÃÅ¾ÃcÃho se vyÄerpÃ¡nÃ kvÃ³ty i-uzlÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e "
+"vyuÅ¾Ãt"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "nepÅ™ekroÄitelnÃ½ (â€žtvrdÃ½â€œ) limit poÄtu souborÅ¯ a sloÅ¾ek (i-uzlÅ¯)"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr "NepÅ™ekroÄitelnÃ¡ hranice poÄtu i-uzlÅ¯, kterÃ© uÅ¾ivatel mÅ¯Å¾e vyuÅ¾Ãt"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
-msgstr "Server"
+msgstr "server"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 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
 msgid "Quota service"
-msgstr "SluÅ¾ba kvÃ³t"
+msgstr "sluÅ¾ba kvÃ³t"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
-msgstr "SdÃlenÃ"
+msgstr "sdÃlenÃ"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
@@ -109,122 +114,123 @@ msgstr "Velikost bloku kvÃ³ty"
 
 #: 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)"
+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:63
 msgid "Comment"
-msgstr "KomentÃ¡Å™"
+msgstr "komentÃ¡Å™"
 
 #: 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:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr "VarovnÃ¡ zprÃ¡va kvÃ³ty"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
-msgstr "ZnakovÃ¡ sada"
+msgstr "znakovÃ¡ sada"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr "ZnakovÃ¡ sada zprÃ¡vy"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr "PÅ™Ãkaz pro posÃlÃ¡nÃ e-mailÅ¯"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 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:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr "Kontakt na podporu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr "E-mailovÃ¡ adresa pro kontaktovÃ¡nÃ sprÃ¡vce"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
-msgstr "Od"
+msgstr "od"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr "Adresa, ze kterÃ© je e-mail poslÃ¡n"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "v kopii poslat i (CC)"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr "Poslat kopii tohoto e-mailu na"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
-msgstr "PÅ™edmÄ›t"
+msgstr "pÅ™edmÄ›t"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr "PÅ™edmÄ›t zaslanÃ©ho varovnÃ©ho e-mailu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
-msgstr "Obsah"
+msgstr "obsah"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr "Obsah odeslanÃ©ho e-mailu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
-msgstr "ZnaÄka"
+msgstr "podpis"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 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:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr "Podpora LDAP zprÃ¡vy"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr "LDAP server ke kterÃ©mu se pÅ™ipojit"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr "RozliÅ¡enÃ© jmÃ©no uÅ¾ivatele, kterÃ½ se pÅ™ipojuje"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 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:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr "Heslo uÅ¾ivatele, kterÃ½m se pÅ™ihlaÅ¡uje"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 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:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
-msgstr "VarovÃ¡nÃ"
+msgstr "varovÃ¡nÃ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "NeplatnÃ¡ hodnota v kÃ³dovÃ¡nÃ znakÅ¯ : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, 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 611a7616c62dc685a77f578af7000b714e300e70..55a032e302159b00cf78d5cad59e34b8f24fb07a 100644
--- a/quota/locale/de/fusiondirectory.po
+++ b/quota/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Server"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr "Server, der das GerÃ¤t fÃ¼r dieses Kontingent bereitstellt"
 
@@ -119,112 +120,112 @@ msgstr "Kommentar"
 msgid "Short comment about this quota"
 msgstr "Kurzer Kommentar Ã¼ber dieses Kontingent"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr "Kontingentwarnmeldung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Zeichensatz"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr "Zeichensatz, der fÃ¼r die Nachricht verwendet werden soll"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr "E-Mail-Adresse, um den Administrator zu benachrichtigen"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Von"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr "Eine Kopie dieser E-Mail senden an"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Betreff"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Inhalt"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr "Inhalt der gesendeten E-Mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Signatur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr "LDAP-NachrichtenunterstÃ¼tzung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "LDAP-Server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
-msgstr "UngÃ¼ltiger Wert in Kodierungen : %s"
+msgstr "UngÃ¼ltiger Wert in Encodings : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, 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 a0e3160b6404f119777d034239c1f52310606ddf..3976141a2b396f7d32c57622204ed970f49b3cac 100644
--- a/quota/locale/el_GR/fusiondirectory.po
+++ b/quota/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,35 +51,35 @@ msgstr "ÎœÎµÏÎ¹ÎºÏŒ ÏŒÏÎ¹Î¿ Ï€Î±ÎºÎÏ„Î¿Ï…"
 msgid "Soft limit for the block the user can use"
 msgstr "Î¤Î¿ Î¼ÎµÏÎ¹ÎºÏŒ ÏŒÏÎ¹Î¿ Ï„Î¿Ï… Ï€Î±ÎºÎÏ„Î¿Ï… Ï€Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "ÎšÎ±Î¸Î¿Î»Î¹ÎºÏŒ ÏŒÏÎ¹Î¿ Ï€Î±ÎºÎÏ„Î¿Ï…"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr "Î¤Î¿ ÎºÎ±Î¸Î¿Î»Î¹ÎºÏŒ ÏŒÏÎ¹Î¿ Ï„Î¿Ï… Ï€Î±ÎºÎÏ„Î¿Ï… Ï€Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "ÎœÎµÏÎ¹ÎºÏŒ ÏŒÏÎ¹Î¿ ÎºÏŒÎ¼Î²Î¿Ï…"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr "Î¤Î¿ Î¼ÎµÏÎ¹ÎºÏŒ ÏŒÏÎ¹Î¿ ÎºÏŒÎ¼Î²Î¿Ï… Ï€Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "ÎšÎ±Î¸Î¿Î»Î¹ÎºÏŒ ÏŒÏÎ¹Î¿ ÎºÏŒÎ¼Î²Î¿Ï…"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr "Î¤Î¿ ÎºÎ±Î¸Î¿Î»Î¹ÎºÏŒ ÏŒÏÎ¹Î¿ ÎºÏŒÎ¼Î²Î¿Ï… Ï€Î¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
-msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Ï„Î· ÏƒÏ…ÏƒÎºÎµÏ…Î® Ï€Î¿Ï… Î±Ï†Î¿ÏÎ¬ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏŒÏÎ¹Î¿"
 
@@ -94,7 +94,7 @@ msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
-msgstr "ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Î¹ Ï€ÏŒÏÎ¿Î¹"
+msgstr "ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î±"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:46
 msgid "Quotas for the shares this server hosts"
@@ -110,7 +110,8 @@ msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… Î¿ÏÎ¯Î¿Ï…"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:54
 msgid "Quota block size on this share (usually 1024)"
-msgstr "Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… Ï„Î¿Ï… Î¿ÏÎ¯Î¿Ï… Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï… Ï€ÏŒÏÎ¿Ï… (ÏƒÏ…Î½Î®Î¸Ï‰Ï‚ 1024)"
+msgstr ""
+"Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Ï€Î±ÎºÎÏ„Î¿Ï… Ï„Î¿Ï… Î¿ÏÎ¯Î¿Ï… Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï… Ï€ÏŒÏÎ¿Ï… (ÏƒÏ…Î½Î®Î¸Ï‰Ï‚ 1024)"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:63
 msgid "Comment"
@@ -120,112 +121,112 @@ msgstr "Î£Ï‡ÏŒÎ»Î¹Î¿"
 msgid "Short comment about this quota"
 msgstr "ÎœÎ¹ÎºÏÏŒ ÏƒÏ‡ÏŒÎ»Î¹Î¿ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏŒÏÎ¹Î¿"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÏŒ Î¼Î®Î½Ï…Î¼Î± Ï„Î¿Ï… Î¿ÏÎ¯Î¿Ï…"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Î£ÏÎ½Î¿Î»Î¿ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÏ‰Î½"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr "Î¤Î¿ ÏƒÏÎ½Î¿Î»Î¿ Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÏ‰Î½ Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Î¼Î®Î½Ï…Î¼Î±"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr "Î•Î½Ï„Î¿Î»Î® Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚ mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr "Î•Î½Ï„Î¿Î»Î® Ï€Î¿Ï… ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ ÏƒÏ„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹ mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr "Î•Ï€Î±Ï†Î® Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î·Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr "Î—Î». Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î³Î¹Î±ÎµÏ€Î±Ï†Î® Î¼Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Î‘Ï€ÏŒ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr "Î—Î». Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»ÎÎ±"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "Î‘Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ ÏƒÎµ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Î¿Ï… Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚ ÏƒÎµ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Î˜ÎÎ¼Î±"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr "Î˜ÎÎ¼Î± Ï„Î¿Ï… Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Î·Î». Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr "Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿ Ï„Î¿Ï… Î·Î». Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Î¥Ï€Î¿Î³ÏÎ±Ï†Î®"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr "Î¥Ï€Î¿Î³ÏÎ±Ï†Î® Ï€Î¿Ï… Î¸Î± Ï„ÎµÎ¸ÎµÎ¯ ÏƒÏ„Î¿ Ï„ÎÎ»Î¿Ï‚ Ï„Î¿Ï… Î·Î». Î¼Î·Î½ÏÎ¼Î±Ï„Î¿Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr "LDAP Î³Î¹Î± Ï„Î·Î½ Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· Î¼Î·Î½Ï…Î¼Î¬Ï„Ï‰Î½"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr "ÎŸ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ LDAP Ï€Î¿Ï… Î¸Î± Î³Î¯Î½ÎµÎ¹ Î· ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr "dn Î±Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr "Î¤Î¿ dn Î±Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ Ï‡ÏÎ®ÏƒÏ„Î· Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr "ÎŸ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï‡ÏÎ®ÏƒÏ„Î· Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î· ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Ï„Î¹Î¼Î® ÏƒÏ„Î¹Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚: %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, 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 a5f5e1cb91d072a3fa75d0e32701ff12bdd1609f..550d3d765cab3dcbd6a18327b80afb7e2894447a 100644
--- a/quota/locale/en/fusiondirectory.po
+++ b/quota/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/es/fusiondirectory.po b/quota/locale/es/fusiondirectory.po
index cc7012e245a5f4e024164bc26681590b0fbd0aa0..fe993f8128224cf5cf1a4441aa287536fccc3661 100644
--- a/quota/locale/es/fusiondirectory.po
+++ b/quota/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr "Limite suave de bloques"
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "Limite duro de bloques"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "Limite suave de inodos"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "Limite duro de inodos"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "Comentario"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Desde"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "Con Copia"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Firma"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/es_CO/fusiondirectory.po b/quota/locale/es_CO/fusiondirectory.po
index 41ba5f57020fe4ef65943d55bde6b89a2ab13b04..71353d65ee506d7be082378d0b1903f28c13690a 100644
--- a/quota/locale/es_CO/fusiondirectory.po
+++ b/quota/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "PrecacuiÃ³n"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/es_VE/fusiondirectory.po b/quota/locale/es_VE/fusiondirectory.po
index ecb3e3e84f7aad395da09e86d04db9c50a99367b..a728cebd55efa1e2f15203a88678bb0d50a00c70 100644
--- a/quota/locale/es_VE/fusiondirectory.po
+++ b/quota/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr "Limite suave de bloques"
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "Limite duro de bloques"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "Limite suave de inodos"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "Limite duro de inodos"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "Comentario"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Desde"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "Con Copia"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Asunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Contenido"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Firma"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fa_IR/fusiondirectory.po b/quota/locale/fa_IR/fusiondirectory.po
index 401ac745a0d6fc7ab2c5d8b1a5af648352f010d8..a4665789cd156d1f690f549e1230ac5ebdc18d54 100644
--- a/quota/locale/fa_IR/fusiondirectory.po
+++ b/quota/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fi_FI/fusiondirectory.po b/quota/locale/fi_FI/fusiondirectory.po
index 43951c9a6aaf517b8708eabd1fef9fbf17e266c5..5286a157093601364f9398898036a07f3b74b699 100644
--- a/quota/locale/fi_FI/fusiondirectory.po
+++ b/quota/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Varoitus"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/fr/fusiondirectory.po b/quota/locale/fr/fusiondirectory.po
index 04caff450cd9a6c43147dc0a2eb16354a256a486..7ae1bf51423f5ffac91e9e9c8c3ff8366e20065f 100644
--- a/quota/locale/fr/fusiondirectory.po
+++ b/quota/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,37 +49,39 @@ msgstr "Taille limite"
 
 #: personal/quota/class_quotaAccount.inc:133
 msgid "Soft limit for the block the user can use"
-msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant avertissement"
+msgstr ""
+"Nombre maximal de blocs utilisables par l'utilisateur avant avertissement"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "Taille critique"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr "Nombre maximal de blocs utilisables par l'utilisateur avant blocage"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "Nombre limite de fichiers"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
-msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant avertissement"
+msgstr ""
+"Nombre maximal d'inode utilisables par l'utilisateur avant avertissement"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "Nombre critique de fichiers"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr "Nombre maximal d'inode utilisables par l'utilisateur avant blocage"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Serveur"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr "Serveur hÃ©bergeant le pÃ©riphÃ©rique sur lequel s'applique le quota"
 
@@ -91,7 +92,7 @@ msgstr "Service Quota"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:30
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/quota/class_serviceQuota.inc:42
 msgid "Shares"
@@ -121,112 +122,112 @@ msgstr "Commentaire"
 msgid "Short comment about this quota"
 msgstr "Court commentaire sur ce quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr "Message d'avertissement du quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Jeu de caractÃ¨res"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr "Encodage utilisÃ© pour le message"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr "Commande de courriel"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr "Commande permettant au serveur d'envoyer des courriels"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr "Contact du support"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr "Adresse de courriel pour contacter l'administrateur"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Depuis"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr "Adresse depuis laquelle les courriels seront envoyÃ©s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr "Envoyer une copie Ã  "
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Sujet"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr "Sujet du courriel d'alerte envoyÃ©"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Contenu"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr "Contenu du courriel envoyÃ©"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Signature"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr "Signature Ã  mettre Ã  la fin du courriel"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr "Support des messages LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Serveur LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr "Serveur LDAP sur lequel se connecter"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr "DN de connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr "DN du compte Ã  utiliser pour la connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr "Mot de passe de connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr "Mot de passe Ã  utiliser pour la connexion"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valeur d'encodage invalideâ€¯: %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, 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 33b9b30a93e253178918da98f199633a387143f2..1dec39c5f82316a92220a919934453a50781d2d2 100644
--- a/quota/locale/hu_HU/fusiondirectory.po
+++ b/quota/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/id/fusiondirectory.po b/quota/locale/id/fusiondirectory.po
index abbcb6bde49fa05410897ce75c8447b133773ebd..b9e44d84b6b72601336d7c7421856c5e23e2bdba 100644
--- a/quota/locale/id/fusiondirectory.po
+++ b/quota/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/it_IT/fusiondirectory.po b/quota/locale/it_IT/fusiondirectory.po
index d98c17d0f7fa9d429e93abcd69bee43f39a7e4f5..ab4f87cb9c2bc01ca52004bc09510fdd1ad0e26c 100644
--- a/quota/locale/it_IT/fusiondirectory.po
+++ b/quota/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:16+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,35 +51,35 @@ msgstr "Dimensione limite del blocco"
 msgid "Soft limit for the block the user can use"
 msgstr "Limite soft per il blocco che l'utente puÃ² utilizzare"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "Dimensione critica del blocco"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr "Limite hard per il blocco che l'utente puÃ² utilizzare"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "Numero limite di files"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr "Limite soft per il gli inodes che l'utente puÃ² utilizzare"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "Numero critico di files"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr "Limite hard per gli inodes che l'utente puÃ² utilizzare"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Server"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr "Server che ospita il dispositivo interessato da questa quota"
 
@@ -122,112 +120,112 @@ msgstr "Commento"
 msgid "Short comment about this quota"
 msgstr "Breve commento circa questa quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr "Messaggio d'avvertimento Quota"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Set di caratteri"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr "set di caratteri del messaggio"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr "Comando Mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 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:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr "Contatto per il supporto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr "Indirizzo email per contattare l'amministratore"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "da"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 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:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr "Invia una copia di questa e-mail a"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Oggetto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr "Soggetto della mail di avvertimento da inviare"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Contenuto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr "Contenuto della e-mail da inviare"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Firma elettronica"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 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:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr "Messaggio di supporto Ldap"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Server LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr "Il server LDAP a cui connettersi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr "dn dell'utente con cui connettersi"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr "dn dell'utente da usare per la connessione"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr "password dell'utente che si connette"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr "password dell'utente usato per la connessione"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valore non valido in codifiche : %s"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, 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 3266587fbc2225cf16bbc8b1480a222cfee87908..bf09043180b1935b82554a9344568d600ddcf18e 100644
--- a/quota/locale/lv/fusiondirectory.po
+++ b/quota/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "BrÄ«dinÄjums"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/nb/fusiondirectory.po b/quota/locale/nb/fusiondirectory.po
index daad6da66283c353ec6e16c501bf1f4affe1f98d..3be706cc8fb66cada3c7c63bf4f7525f792afe3d 100644
--- a/quota/locale/nb/fusiondirectory.po
+++ b/quota/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Tjener"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/nl/fusiondirectory.po b/quota/locale/nl/fusiondirectory.po
index fc33921f8aadf733bc7aeea43c6b34e2f747a1db..5867f8968a717d2f5a87f55ca9f4ce9be935d1ea 100644
--- a/quota/locale/nl/fusiondirectory.po
+++ b/quota/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr "Block soft limit"
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr "Block hard limit"
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr "Inode soft limit"
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr "Inode hard limit"
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Server"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "Opmerking"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Charset"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
-msgstr ""
+msgstr "E-mail commando"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "Van"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
-msgstr ""
+msgstr "Verstuur een kopie van deze mail naar"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Inhoud"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
-msgstr ""
+msgstr "Inhoud van de verzonden e-mail"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Handtekening"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pl/fusiondirectory.po b/quota/locale/pl/fusiondirectory.po
index f27c88527671e658a6397610a578ac541cd9d8ce..f5b3d1acea58a6d13b611bd2b785084a803f4ede 100644
--- a/quota/locale/pl/fusiondirectory.po
+++ b/quota/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Serwer"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "Komentarz"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr "Kodowanie"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "Serwer LDAP"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pt/fusiondirectory.po b/quota/locale/pt/fusiondirectory.po
index 987c8297cb51705c0737ad44ec0ec8326133b770..6f41072f0b11afdd5c0e4d13341b47c82f0f56ac 100644
--- a/quota/locale/pt/fusiondirectory.po
+++ b/quota/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Servidor"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/pt_BR/fusiondirectory.po b/quota/locale/pt_BR/fusiondirectory.po
index f22e4c7a2927ae239ddc9cdc2cd2a4a7a2dd858d..bac8ee60ef67c971d2c3d58cc8013758ae65add9 100644
--- a/quota/locale/pt_BR/fusiondirectory.po
+++ b/quota/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "servidor"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "Comentar"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "De"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr "CC"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Assunto"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "ConteÃºdo"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr "Assinatura"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ru/fusiondirectory.po b/quota/locale/ru/fusiondirectory.po
index 7a44ade4e78b1183814c04b9a75c7da583f46289..405b5bf7c8f1a4347713593b8c87d90a0c6f7dde 100644
--- a/quota/locale/ru/fusiondirectory.po
+++ b/quota/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr "ÐžÑ‚"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Ð¢ÐµÐ¼Ð°"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "LDAP-ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ru@petr1708/fusiondirectory.po b/quota/locale/ru@petr1708/fusiondirectory.po
index 531cdbf1cf607631041fc4750375b91a2e33defc..3c42e82561cbe2c160ed5ea6bf45cbbb326d1c16 100644
--- a/quota/locale/ru@petr1708/fusiondirectory.po
+++ b/quota/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/sv/fusiondirectory.po b/quota/locale/sv/fusiondirectory.po
index 62b3c40a0e01f6fb0376b4a0e824c7c8bbada711..07cd8d1072d24ee53c1634e233cf7fe187457756 100644
--- a/quota/locale/sv/fusiondirectory.po
+++ b/quota/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "Server"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr "Ã„mne"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr "InnehÃ¥ll"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Varning"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/ug/fusiondirectory.po b/quota/locale/ug/fusiondirectory.po
index 5254469e0d97ce44c9acbf2d62388d28dd5a9b3b..59836da5979b146b60a8a11a75a5846d9d94b0f1 100644
--- a/quota/locale/ug/fusiondirectory.po
+++ b/quota/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +50,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +119,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/vi_VN/fusiondirectory.po b/quota/locale/vi_VN/fusiondirectory.po
index 87e3737700416f49228ef4976b4b1bc8b9ab7143..3a77ef7640df905d6e62d39aa90fb621c3f10163 100644
--- a/quota/locale/vi_VN/fusiondirectory.po
+++ b/quota/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr ""
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/locale/zh/fusiondirectory.po b/quota/locale/zh/fusiondirectory.po
index b6e6bdd397da03bf034dcbda9a2aa6d886f8f063..b434647e3b685b0ee7080ab95e0bc7b7b0728f5d 100644
--- a/quota/locale/zh/fusiondirectory.po
+++ b/quota/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,35 +51,35 @@ msgstr ""
 msgid "Soft limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Block hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:139
+#: personal/quota/class_quotaAccount.inc:142
 msgid "Hard limit for the block the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Inode soft limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:145
+#: personal/quota/class_quotaAccount.inc:151
 msgid "Soft limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Inode hard limit"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:151
+#: personal/quota/class_quotaAccount.inc:160
 msgid "Hard limit for the inodes the user can use"
 msgstr ""
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server"
 msgstr "æœåŠ¡å™¨"
 
-#: personal/quota/class_quotaAccount.inc:157
+#: personal/quota/class_quotaAccount.inc:169
 msgid "Server hosting the device this quota is for"
 msgstr ""
 
@@ -119,112 +120,112 @@ msgstr "æ³¨é‡Š"
 msgid "Short comment about this quota"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:76
+#: admin/systems/services/quota/class_serviceQuota.inc:78
 msgid "Quota warning message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:79
+#: admin/systems/services/quota/class_serviceQuota.inc:81
 msgid "Charset use for the message"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Mail command"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:83
+#: admin/systems/services/quota/class_serviceQuota.inc:85
 msgid "Command allowing the server to send mails"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Support contact"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:87
+#: admin/systems/services/quota/class_serviceQuota.inc:89
 msgid "Email address to contact the administrator"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "From"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:91
+#: admin/systems/services/quota/class_serviceQuota.inc:93
 msgid "Email from which the email is sent"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "CC"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:95
+#: admin/systems/services/quota/class_serviceQuota.inc:97
 msgid "Send a copy of this email to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:99
+#: admin/systems/services/quota/class_serviceQuota.inc:101
 msgid "Subject of the sent warning email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:103
+#: admin/systems/services/quota/class_serviceQuota.inc:105
 msgid "Content of the sent email"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:107
+#: admin/systems/services/quota/class_serviceQuota.inc:109
 msgid "Signature to put at the end of the mail"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:113
+#: admin/systems/services/quota/class_serviceQuota.inc:115
 msgid "LDAP message support"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "LDAP server"
 msgstr "LDAP æœåŠ¡å™¨"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:116
+#: admin/systems/services/quota/class_serviceQuota.inc:118
 msgid "The LDAP server to bind to"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "Bind user dn"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:120
+#: admin/systems/services/quota/class_serviceQuota.inc:122
 msgid "The user dn to use for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "Bind user password"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:124
+#: admin/systems/services/quota/class_serviceQuota.inc:126
 msgid "The password of the user used for bind"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 msgid "Warning"
 msgstr "è¦å‘Š"
 
-#: admin/systems/services/quota/class_serviceQuota.inc:157
+#: admin/systems/services/quota/class_serviceQuota.inc:159
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
 
-#: admin/systems/services/quota/class_serviceQuota.inc:174
+#: admin/systems/services/quota/class_serviceQuota.inc:176
 #, php-format
 msgid "(%s by %s)"
 msgstr ""
diff --git a/quota/personal/quota/class_quotaAccount.inc b/quota/personal/quota/class_quotaAccount.inc
index 2d0b82bd38f1b5734d2216915855a063a731fc63..2d7ca1d8c7739390917560d0eb747da8520b9d8a 100644
--- a/quota/personal/quota/class_quotaAccount.inc
+++ b/quota/personal/quota/class_quotaAccount.inc
@@ -132,25 +132,37 @@ class quotaAccount extends simplePlugin
                 new BytesSizeAttribute(
                   _('Block soft limit'), _('Soft limit for the block the user can use'),
                   'quotaBlockSoftLimit', TRUE,
-                  0 /*min*/, FALSE /*no max*/,
+                  // min
+                  0,
+                  // no max
+                  FALSE,
                   0
                 ),
                 new BytesSizeAttribute(
                   _('Block hard limit'), _('Hard limit for the block the user can use'),
                   'quotaBlockHardLimit', TRUE,
-                  0 /*min*/, FALSE /*no max*/,
+                  // min
+                  0,
+                  // no max
+                  FALSE,
                   0
                 ),
                 new IntAttribute(
                   _('Inode soft limit'), _('Soft limit for the inodes the user can use'),
                   'quotaInodeSoftLimit', TRUE,
-                  0 /*min*/, FALSE /*no max*/,
+                  // min
+                  0,
+                  // no max
+                  FALSE,
                   0
                 ),
                 new IntAttribute(
                   _('Inode hard limit'), _('Hard limit for the inodes the user can use'),
                   'quotaInodeHardLimit', TRUE,
-                  0 /*min*/, FALSE /*no max*/,
+                  // min
+                  0,
+                  // no max
+                  FALSE,
                   0
                 ),
                 new SelectAttribute(
@@ -160,8 +172,10 @@ class quotaAccount extends simplePlugin
               ),
               ':'
             ),
+            // no order
             FALSE,
             array(),
+            // edit button
             TRUE
           )
         )
diff --git a/quota/personal/quota/main.inc b/quota/personal/quota/main.inc
index 571ffab2795fa70d1acc8c4e96ce753fedefda28..d92792f93850a1c3062b5425c110b902b01dc8af 100644
--- a/quota/personal/quota/main.inc
+++ b/quota/personal/quota/main.inc
@@ -15,8 +15,8 @@
 
   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.
- */
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
 
 simplePlugin::mainInc('quotaAccount', $ui->dn);
 ?>
diff --git a/renater-partage/admin/systems/services/renater-partage/class_serviceRenaterPartage.inc b/renater-partage/admin/systems/services/renater-partage/class_serviceRenaterPartage.inc
new file mode 100644
index 0000000000000000000000000000000000000000..b8db7e72257f54438af154ab57541b94d1aa52a4
--- /dev/null
+++ b/renater-partage/admin/systems/services/renater-partage/class_serviceRenaterPartage.inc
@@ -0,0 +1,112 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016-2017  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class serviceRenaterPartage extends simpleService
+{
+  var $objectclasses = array('fdRenaterPartageServer');
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'     => _('Renater Partage'),
+      'plDescription'   => _('Renater Partage'),
+      'plIcon'          => 'geticon.php?context=applications&icon=renater-partage&size=16',
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ()
+  {
+    return array (
+      'main' => array (
+        'name'  => _('Settings'),
+        'class' => array('fullwidth'),
+        'attrs' => array (
+          new URLAttribute(
+            _('URI'), _('URI to contact the Renater Partage API'),
+            'fdRenaterPartageServerUri', TRUE
+          ),
+          new StringAttribute(
+            _('User Agent'), _('User Agent to use to contact the Renater Partage API'),
+            'fdRenaterPartageServerUserAgent', TRUE,
+            'FusionDirectory'
+          ),
+          new SelectAttribute(
+            _('Mailbox deletion'), _('What to do with the PARTAGE account when mail tab is deactivated or user is deleted'),
+            'fdRenaterPartageServerDeletionType', TRUE,
+            array(  'delete',   'disable'), '',
+            array(_('Delete'),_('Disable'))
+          ),
+        )
+      ),
+      'domains' => array(
+        'template'  => get_template_path('renater_domains.tpl', TRUE, dirname(__FILE__)),
+        'name'      => _('Domains'),
+        'class'     => array('fullwidth'),
+        'attrs'     => array(
+          new OrderedArrayAttribute(
+            new CharSeparatedCompositeAttribute(
+              _('Domains handled by this Renater Partage server'),
+              'fdRenaterPartageServerMailDomain',
+              array(
+                new StringAttribute (
+                  _('Domain'), _('Domain handled by this server'),
+                  'renaterPartageDomain', TRUE
+                ),
+                new StringAttribute (
+                  _('Key'), _('Key for this domain'),
+                  'renaterPartageDomainKey', TRUE
+                ),
+                new StringAttribute (
+                  _('Class of service'), _('Possible classes of service for this domain, separated by commas'),
+                  'renaterPartageDomainCOS', TRUE
+                )
+              ),
+              ':',
+              '',
+              _('Domains')
+            ),
+            FALSE, array(), TRUE
+          )
+        )
+      )
+    );
+  }
+
+  function __construct ($dn = NULL, $parent = NULL)
+  {
+    parent::__construct($dn, $parent);
+    $this->attributesAccess['fdRenaterPartageServerMailDomain']->setLinearRendering(FALSE);
+  }
+
+  protected function post_save()
+  {
+    parent::post_save();
+    mailMethod::resetMailServersCache();
+  }
+
+  protected function post_remove ()
+  {
+    parent::post_remove();
+    mailMethod::resetMailServersCache();
+  }
+}
+?>
diff --git a/renater-partage/admin/systems/services/renater-partage/renater_domains.tpl b/renater-partage/admin/systems/services/renater-partage/renater_domains.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..42bc9a3415fc389553813293253855dc346896ab
--- /dev/null
+++ b/renater-partage/admin/systems/services/renater-partage/renater_domains.tpl
@@ -0,0 +1,41 @@
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
+  <legend><span><label for="{$attributes.fdRenaterPartageServerMailDomain.htmlid}">{$section}</label></span></legend>
+  <div>
+  <table>
+    <tr>
+      <td title="{$attributes.fdRenaterPartageServerMailDomain.description}" colspan="4">
+        {eval var=$attributes.fdRenaterPartageServerMailDomain.input}
+      </td>
+    </tr>
+    <tr>
+      <td title="{$attributes.renaterPartageDomain.description}">
+        <label for="{$attributes.renaterPartageDomain.htmlid}">
+          {eval var=$attributes.renaterPartageDomain.label}
+        </label>
+      </td>
+      <td>{eval var=$attributes.renaterPartageDomain.input}</td>
+    </tr>
+    <tr>
+      <td title="{$attributes.renaterPartageDomainKey.description}">
+        <label for="{$attributes.renaterPartageDomainKey.htmlid}">
+          {eval var=$attributes.renaterPartageDomainKey.label}
+        </label>
+      </td>
+      <td>{eval var=$attributes.renaterPartageDomainKey.input}</td>
+    </tr>
+    <tr>
+      <td title="{$attributes.renaterPartageDomainCOS.description}">
+        <label for="{$attributes.renaterPartageDomainCOS.htmlid}">
+          {eval var=$attributes.renaterPartageDomainCOS.label}
+        </label>
+      </td>
+      <td>{eval var=$attributes.renaterPartageDomainCOS.input}</td>
+    </tr>
+    <tr>
+      <td title="{$attributes.fdRenaterPartageServerMailDomain_buttons.description}" colspan="4">
+        {eval var=$attributes.fdRenaterPartageServerMailDomain_buttons.input}
+      </td>
+    </tr>
+  </table>
+  </div>
+</fieldset>
diff --git a/renater-partage/contrib/openldap/renater-partage-fd.schema b/renater-partage/contrib/openldap/renater-partage-fd.schema
new file mode 100644
index 0000000000000000000000000000000000000000..54bd09d116c4c725404c7dc50bc744423209e98e
--- /dev/null
+++ b/renater-partage/contrib/openldap/renater-partage-fd.schema
@@ -0,0 +1,33 @@
+##
+## renater-partage-fd.schema - Needed by Fusion Directory for managing Renater Partage API
+##
+
+# attributes
+attributetype ( 1.3.6.1.4.1.38414.63.1.1 NAME 'fdRenaterPartageServerUri'
+  DESC 'FusionDirectory - URI to connect to Renater Partage API'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+attributetype ( 1.3.6.1.4.1.38414.63.1.2 NAME 'fdRenaterPartageServerMailDomain'
+  DESC 'FusionDirectory - Domain name, key and available classes of service separated by a colon'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
+
+attributetype ( 1.3.6.1.4.1.38414.63.1.3 NAME 'fdRenaterPartageServerUserAgent'
+  DESC 'FusionDirectory - User Agent to connect to Renater Partage API'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+attributetype ( 1.3.6.1.4.1.38414.63.1.4 NAME 'fdRenaterPartageServerDeletionType'
+  DESC 'FusionDirectory - Should user be deleted or deactivated upon deletion - should contain delete or disable'
+  EQUALITY caseExactIA5Match
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
+# Objectclasses
+objectclass (1.3.6.1.4.1.38414.63.2.1 NAME 'fdRenaterPartageServer' SUP top AUXILIARY
+  DESC 'FusionDirectory - Renater Partage server description'
+  MUST ( cn $ fdRenaterPartageServerUri $ fdRenaterPartageServerUserAgent )
+  MAY  ( fdRenaterPartageServerMailDomain $ fdRenaterPartageServerDeletionType ))
diff --git a/renater-partage/html/themes/breezy/icons/16/apps/renater-partage.png b/renater-partage/html/themes/breezy/icons/16/apps/renater-partage.png
new file mode 100644
index 0000000000000000000000000000000000000000..914dbc646304cedef9fdd2f40d58543276dc1b08
Binary files /dev/null and b/renater-partage/html/themes/breezy/icons/16/apps/renater-partage.png differ
diff --git a/renater-partage/locale/ar/fusiondirectory.po b/renater-partage/locale/ar/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..61c297248f925ba7793ef20f76f5b8e67005eb42
--- /dev/null
+++ b/renater-partage/locale/ar/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "ØªØØ°ÙŠØ±"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/ca/fusiondirectory.po b/renater-partage/locale/ca/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c47e68774cc3e81b982c54a57c62cf96900bda55
--- /dev/null
+++ b/renater-partage/locale/ca/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "AvÃs"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/cs_CZ/fusiondirectory.po b/renater-partage/locale/cs_CZ/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6a59ca7c2c94e96426ef140fc5cf237e4bb9d89b
--- /dev/null
+++ b/renater-partage/locale/cs_CZ/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "varovÃ¡nÃ"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Nikdy"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "neznÃ¡mÃ©"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "smazat"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "domÃ©na"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "KlÃÄ"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/de/fusiondirectory.po b/renater-partage/locale/de/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..68a15f47b2de9f353c767829814cd04fbef0bcb6
--- /dev/null
+++ b/renater-partage/locale/de/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Warnung"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Nie"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr "URI"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Entfernen"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr "DomÃ¤nen"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "DomÃ¤ne"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "SchlÃ¼ssel"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr "SchlÃ¼ssel fÃ¼r diese DomÃ¤ne"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr "Dienstklasse"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/el_GR/fusiondirectory.po b/renater-partage/locale/el_GR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..bfd33ada89a862c8295ebdbade3d72db2807a071
--- /dev/null
+++ b/renater-partage/locale/el_GR/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el_GR\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Î Î¿Ï„Î"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î¿"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Î¤Î¿Î¼ÎÎ±Ï‚"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "ÎšÎ»ÎµÎ¹Î´Î¯"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/en/fusiondirectory.po b/renater-partage/locale/en/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e6dea368a8c539195d7923e47297b7ec535afa82
--- /dev/null
+++ b/renater-partage/locale/en/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/es/fusiondirectory.po b/renater-partage/locale/es/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..42adb41d8b12d04c0672534270a13e1c706884e3
--- /dev/null
+++ b/renater-partage/locale/es/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Eliminar"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Dominio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Llave"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/es_CO/fusiondirectory.po b/renater-partage/locale/es_CO/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e616755f0492cdd598645e06f0ad6b2a180fd492
--- /dev/null
+++ b/renater-partage/locale/es_CO/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_CO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "PrecacuiÃ³n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Borrar"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Dominio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/es_VE/fusiondirectory.po b/renater-partage/locale/es_VE/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e202021f7103a7abc69d0e7692185b6746cb2418
--- /dev/null
+++ b/renater-partage/locale/es_VE/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Eliminar"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Dominio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Llave"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/fa_IR/fusiondirectory.po b/renater-partage/locale/fa_IR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f306b4f7e512b4d6dea8b15a7954abe2d2823e51
--- /dev/null
+++ b/renater-partage/locale/fa_IR/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fa_IR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/fi_FI/fusiondirectory.po b/renater-partage/locale/fi_FI/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..d1b8139cd88c07150a5ad679c4d656e365edba53
--- /dev/null
+++ b/renater-partage/locale/fi_FI/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Varoitus"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/fr/fusiondirectory.po b/renater-partage/locale/fr/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..16c5955f9a96fc7fbfed2274ba06366d78b128d5
--- /dev/null
+++ b/renater-partage/locale/fr/fusiondirectory.po
@@ -0,0 +1,163 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr "Le serveur n'a pas retournÃ© le jeton d'authentification"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr "Partage API rÃ©ponse mal formÃ©e"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr "Partage API Auth a Ã©chouÃ©: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr "Partage API Auth a Ã©chouÃ© sans message d'erreur"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr "Impossible de se connecter Ã  %s: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr "Impossible de se connecter Ã  %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Avertissement"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+"Plusieurs adresses ont Ã©tÃ© fournies dans gosaMailForwardingAddress, mais une"
+" seule est prise en charge par PARTAGE. %s sera envoyÃ© Ã  PARTAGE."
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr "Un compte avec la mÃªme adresse de messagerie existe dÃ©jÃ  dans Partage"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr "Valeur non valide dans fdRenaterPartageServerDeletionType"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Jamais"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr "DerniÃ¨re connexion"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr "Statut du compte"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr "Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr "ParamÃ¨tres"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr "URI"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr "URI pour contacter l'api Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr "Agent utilisateur"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr "Agent utilisateur Ã  utiliser pour contacter l'API Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr "Suppression de boÃ®te aux lettres"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+"Que faire avec le compte PARTAGE lorsque l'onglet Courrier est dÃ©sactivÃ© ou "
+"l'utilisateur est supprimÃ©"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Supprimer"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr "DÃ©sactiver"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr "Domaines"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr "Domaines traitÃ©s par ce serveur Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Domaine"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr "Domaines traitÃ©s par ce serveur"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Clef"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr "Clef pour ce domaine"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr "Classe de services"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
+"Classes de service possibles pour ce domaine, sÃ©parÃ©es par des virgules"
diff --git a/renater-partage/locale/hu_HU/fusiondirectory.po b/renater-partage/locale/hu_HU/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..70832f12663a22e651f7c5f324121c751b019077
--- /dev/null
+++ b/renater-partage/locale/hu_HU/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hu_HU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/id/fusiondirectory.po b/renater-partage/locale/id/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..46d0fed9f1c9a939d0303991818746c2a878d598
--- /dev/null
+++ b/renater-partage/locale/id/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/it_IT/fusiondirectory.po b/renater-partage/locale/it_IT/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..63a89605ee03bd1d80354ed8cd19a73122cc249e
--- /dev/null
+++ b/renater-partage/locale/it_IT/fusiondirectory.po
@@ -0,0 +1,162 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr "Il server non ha restituito il token di auth"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr "La risposta API di Partage Ã© malformata"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr "L'auth dell'API di Partage non Ã© riuscita: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr "L'Auth dell'API Partage non Ã¨ riuscita con nessun messaggio di errore"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr "Impossible connettersi a %s: %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr "Impossibile connettersi a %s"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Avvertimento"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+"Diversi indirizzi sono stati dati in gosaMailForwardingAddress ma solo uno Ã¨"
+" supportato da PARTAGE. %s verrÃ  inviato a PARTAGE."
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr "Un account con lo stesso indirizzo e-mail esiste giÃ  in Partage"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr "Valore non valido in fdRenaterPartageServerDeletionType"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Mai"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr "Ultimo accesso"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr "Stato dell'account"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr "Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr "URI"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr "Link per contattare l'API Partage di Renater"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr "Utente Agente"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr "User Agent da utilizzare per contattare l'API Renater Partage"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr "Cancellazione mailbox"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+"Cosa fare con l'account PARTAGE quando la tab di posta Ã¨ disattivata o "
+"l'utente viene eliminato"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Elimina"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr "Disattivare"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr "Domini"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr "Domini gestiti da questo server di Partage Renater"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Dominio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr "Domini gestiti da questo server"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Key"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr "Chiave per questo dominio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr "Classe di servizio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr "Possibili classi di servizio per questo dominio, separate da virgole"
diff --git a/renater-partage/locale/lv/fusiondirectory.po b/renater-partage/locale/lv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..5b77f018576d003a532ad4b6a7c63d162c183686
--- /dev/null
+++ b/renater-partage/locale/lv/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "BrÄ«dinÄjums"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/nb/fusiondirectory.po b/renater-partage/locale/nb/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..869558b9414f5e958f36c4836a7d2cf429d24671
--- /dev/null
+++ b/renater-partage/locale/nb/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/nl/fusiondirectory.po b/renater-partage/locale/nl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..e0f30f3b54bd40008463689231b0b589d9b1bae6
--- /dev/null
+++ b/renater-partage/locale/nl/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr "Nooit"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Domein"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Sleutel"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/pl/fusiondirectory.po b/renater-partage/locale/pl/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3b61a2cfa484594e71681e4156a1781c8b45cc56
--- /dev/null
+++ b/renater-partage/locale/pl/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "OstrzeÅ¼enie"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Nieznane"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "UsuÅ„"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Domena"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/pt/fusiondirectory.po b/renater-partage/locale/pt/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..3898cd1adf30d1cc61244b90274c33712260c227
--- /dev/null
+++ b/renater-partage/locale/pt/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "AtenÃ§Ã£o"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Deletar"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/pt_BR/fusiondirectory.po b/renater-partage/locale/pt_BR/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..86e811bb9380ff601c5a414dc3f25da97adc3f91
--- /dev/null
+++ b/renater-partage/locale/pt_BR/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Aviso"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Deletar"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "DomÃnio"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Chave"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/ru/fusiondirectory.po b/renater-partage/locale/ru/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..f111840fcb1f5fc87a2112b885d3a4deba490e8d
--- /dev/null
+++ b/renater-partage/locale/ru/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "Ð”Ð¾Ð¼ÐµÐ½"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/ru@petr1708/fusiondirectory.po b/renater-partage/locale/ru@petr1708/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..8600ce000288f20761f56a527bce24bcc9aac472
--- /dev/null
+++ b/renater-partage/locale/ru@petr1708/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru@petr1708\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/sv/fusiondirectory.po b/renater-partage/locale/sv/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..4cc294aa18b14e99c9915c2b816a46614c6d4729
--- /dev/null
+++ b/renater-partage/locale/sv/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Varning"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "OkÃ¤nd"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "Ta bort"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "DomÃ¤n"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr "Nyckel"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/ug/fusiondirectory.po b/renater-partage/locale/ug/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..6893675e8cee7d4d2b3d920a7a192a2e85709dd3
--- /dev/null
+++ b/renater-partage/locale/ug/fusiondirectory.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ug\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/vi_VN/fusiondirectory.po b/renater-partage/locale/vi_VN/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..42a52708b02085865e64c146e2df442750ff1fe9
--- /dev/null
+++ b/renater-partage/locale/vi_VN/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi_VN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "Cáº£nh bÃ¡o"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "KhÃ´ng rÃµ"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "XÃ³a"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/locale/zh/fusiondirectory.po b/renater-partage/locale/zh/fusiondirectory.po
new file mode 100644
index 0000000000000000000000000000000000000000..c841f5c7e19e233351cdcdfda3e025faaf5d3edf
--- /dev/null
+++ b/renater-partage/locale/zh/fusiondirectory.po
@@ -0,0 +1,158 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR FusionDirectory Project
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory VERSION\n"
+"Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2017\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:60
+msgid "Server did not return auth token"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:111
+msgid "Partage API answer malformated"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:115
+#, php-format
+msgid "Partage API Auth failed: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:117
+msgid "Partage API Auth failed with no error message"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:126
+#, php-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:128
+#, php-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+msgid "Warning"
+msgstr "è¦å‘Š"
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:193
+#, php-format
+msgid ""
+"Several addresses were given in gosaMailForwardingAddress but only one is "
+"supported by PARTAGE. %s will be sent to PARTAGE."
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:320
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:333
+msgid "An account with the same email address already exists in Partage"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:398
+msgid "Invalid value in fdRenaterPartageServerDeletionType"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:439
+msgid "Never"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:446
+msgid "Last login"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Account status"
+msgstr ""
+
+#: personal/mail/mail-methods/class_mail-methods-renater-partage.inc:447
+msgid "Unknown"
+msgstr "æœªçŸ¥"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:28
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:29
+msgid "Renater Partage"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:40
+msgid "Settings"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:44
+msgid "URI to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:48
+msgid "User Agent to use to contact the Renater Partage API"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid "Mailbox deletion"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:53
+msgid ""
+"What to do with the PARTAGE account when mail tab is deactivated or user is "
+"deleted"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Delete"
+msgstr "åˆ é™¤"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:56
+msgid "Disable"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:62
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:85
+msgid "Domains"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:67
+msgid "Domains handled by this Renater Partage server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain"
+msgstr "åŸŸ"
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:71
+msgid "Domain handled by this server"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:75
+msgid "Key for this domain"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Class of service"
+msgstr ""
+
+#: admin/systems/services/renater-partage/class_serviceRenaterPartage.inc:79
+msgid "Possible classes of service for this domain, separated by commas"
+msgstr ""
diff --git a/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc b/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc
new file mode 100644
index 0000000000000000000000000000000000000000..5b6d9d9d4ac4f60b29b49ae4316292cb19b4654c
--- /dev/null
+++ b/renater-partage/personal/mail/mail-methods/class_mail-methods-renater-partage.inc
@@ -0,0 +1,487 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2016-2017  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class mailMethodRenaterPartage extends mailMethod
+{
+  protected $enableQuota            = TRUE;
+  protected $enableVacation         = FALSE;
+  protected $enableFolderTypes      = FALSE;
+
+  protected $user_id = '%MAIL%';
+
+  private $http_options = array();
+  private $ssl_options = array();
+  private $token;
+  private $tokenTime;
+  private $cachedAccount;
+
+  /*! \brief  Connect to renater PARTAGEÂ API and store the auth token
+      @return Boolean True if connection was successful
+   */
+  public function connect()
+  {
+    parent::connect();
+    $servers = static::getMailServers();
+    $infos = $servers[$this->parent->gosaMailServer];
+
+    $this->connected = FALSE;
+
+    $ts = time();
+    $preauth = hash_hmac('sha1', $infos['domain'].'|'.$ts, $infos['key']);
+
+    $request = array(
+      'domain'    => $infos['domain'],
+      'timestamp' => $ts,
+      'preauth'   => $preauth
+    );
+
+    $response = $this->query('Auth', $request);
+
+    if ($response === FALSE) {
+      return FALSE;
+    } elseif (!isset($response['Response']['token'])) {
+      $this->error = _('Server did not return auth token');
+      return FALSE;
+    } else {
+      $this->token      = $response['Response']['token'];
+      $this->tokenTime  = $ts;
+      $this->connected  = TRUE;
+      return TRUE;
+    }
+  }
+
+  private function query($command, $post)
+  {
+    $servers = static::getMailServers();
+    $infos = $servers[$this->parent->gosaMailServer];
+
+    if (is_array($post)) {
+      $post = http_build_query($post);
+    }
+
+    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $command, '<b>MAIL: Command</b>');
+    @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, htmlentities($post, ENT_COMPAT, 'UTF-8'),
+      '<b>MAIL: Query</b>');
+
+    // performs the HTTP(S) POST
+    $opts = array (
+      'http' => array_merge(
+        array (
+          'method'      => 'POST',
+          'user_agent'  => $infos['user_agent'],
+          'content'     => $post
+        ),
+        $this->http_options
+      ),
+      'ssl' => $this->ssl_options
+    );
+
+    if ($command != 'Auth') {
+      $command .= '/'.$this->token;
+    }
+
+    $context  = stream_context_create($opts);
+    $fp = fopenWithErrorHandling($infos['uri'].'/'.$command, 'r', FALSE, $context);
+    if (!is_array($fp)) {
+      $response = '';
+      while ($row = fgets($fp)) {
+        $response .= trim($row)."\n";
+      }
+      $response = xml::xml2array($response, FALSE);
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $response, '<b>MAIL: Answer</b>');
+
+      if (!isset($response['Response']['status'])) {
+        $this->error = _('Partage API answer malformated');
+        return FALSE;
+      } elseif ($response['Response']['status'] != 0) {
+        if (isset($response['Response']['message'])) {
+          $this->error = sprintf(_('Partage API Auth failed: %s'), $response['Response']['message']);
+        } else {
+          $this->error = _('Partage API Auth failed with no error message');
+        }
+        return FALSE;
+      }
+
+      return $response;
+    } else {
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, $fp, '<b>MAIL: No Answer</b>');
+      if (!empty($fp)) {
+        $this->error = sprintf(_('Unable to connect to %s: %s'), $infos['uri'], implode("\n", $fp));
+      } else {
+        $this->error = sprintf(_('Unable to connect to %s'), $infos['uri']);
+      }
+      return FALSE;
+    }
+  }
+
+  /*! \brief  Disconnect from the API (deletes the auth token)
+   */
+  public function disconnect()
+  {
+    parent::disconnect();
+    unset($this->token);
+    unset($this->tokenTime);
+  }
+
+  /*! \brief  Returns the connection status of this method.
+      @return Boolean True if this method is connected else false.
+   */
+  public function is_connected()
+  {
+    /* If the token is older than 5 minutes it will get rejected. 5min = 300sec */
+    return (parent::is_connected() && (time() - $this->tokenTime < 250));
+  }
+
+  /*! \brief  Returns true the current object represents a valid account
+      @return Boolean TRUE if this is a valid account else FALSE
+  */
+  public function account_exists()
+  {
+    $this->reset_error();
+    return $this->cacheAccount();
+  }
+
+  private function cacheAccount()
+  {
+    if (empty($this->account_id)) {
+      return FALSE;
+    } elseif (isset($this->cachedAccount['account']) && ($this->account_id == $this->cachedAccount['id'])) {
+      return TRUE;
+    }
+    $answer = $this->query('GetAccount', array('name' => $this->account_id));
+    if (($answer !== FALSE) && isset($answer['Response']['account'])) {
+      $this->cachedAccount = array(
+        'account' => $answer['Response']['account'],
+        'id'      => $this->account_id,
+        'time'    => time()
+      );
+      return TRUE;
+    } else {
+      return FALSE;
+    }
+  }
+
+  private function getAccountArray($infos)
+  {
+    $account = array(
+      'name'                                => $this->account_id,
+      'zimbraCOSId'                         => $infos['cos_id'],
+      'zimbraMailQuota'                     => $this->parent->gosaMailQuota * 1024 * 1024,
+      'zimbraPrefMailLocalDeliveryDisabled' => ($this->parent->flag_ownmailbox ? 'TRUE' : 'FALSE'),
+    );
+    if (!empty($this->parent->gosaMailForwardingAddress)) {
+      $count = count($this->parent->gosaMailForwardingAddress);
+      $address = $this->parent->gosaMailForwardingAddress[0];
+      if ($count > 1) {
+        msg_dialog::display(_('Warning'), sprintf(_('Several addresses were given in gosaMailForwardingAddress but only one is supported by PARTAGE. %s will be sent to PARTAGE.'), $address));
+      }
+      $account['zimbraPrefMailForwardingAddress'] = $address;
+    }
+
+    $userFields = array(
+      'sn', 'givenName', 'description',
+      'l', 'st',
+      'telephoneNumber', 'mobile', 'pager', 'facsimileTelephoneNumber',
+      'displayName', 'homePhone',
+      'title', 'ou',
+      'street', 'postalCode', 'postOfficeBox'
+    );
+    $userTab = $this->parent->parent->getBaseObject();
+    foreach ($userFields as $field) {
+      if (isset($userTab->$field)) {
+        $account[$field] = $userTab->$field;
+      }
+    }
+    $userMatchingFields = array(
+      'o' => 'company',
+      'roomNumber' => 'physicalDeliveryOfficeName'
+    );
+    foreach ($userMatchingFields as $fdField => $partageField) {
+      if (isset($userTab->$fdField)) {
+        $account[$partageField] = $userTab->$fdField;
+      }
+    }
+    $account['zimbraAccountStatus'] = ($userTab->attributesAccess['userPassword']->isLocked() ? 'locked' : 'active');
+    $account['initials'] = strtoupper(substr($userTab->givenName, 0, 1).substr($userTab->sn, 0, 1));
+
+    /* Sync fields from SUPANN if tab is active */
+    if (isset($this->parent->parent->by_object['supannAccount']) && $this->parent->parent->by_object['supannAccount']->is_account) {
+      $supannTab = $this->parent->parent->by_object['supannAccount'];
+      $account['carLicense']      = $supannTab->eduPersonPrincipalName;
+      $account['zimbraHideInGal'] = ($supannTab->supannListeRouge ? 'TRUE' : 'FALSE');
+    }
+
+    /* Sync fields from personal if tab is active */
+    if (isset($this->parent->parent->by_object['personalInfo']) && $this->parent->parent->by_object['personalInfo']->is_account) {
+      $personalTab    = $this->parent->parent->by_object['personalInfo'];
+      $account['co']  = $personalTab->co;
+    }
+
+    return $account;
+  }
+
+  private function createAccount($infos)
+  {
+    $account = $this->getAccountArray($infos);
+
+    /* Remove empty values */
+    foreach ($account as $key => $value) {
+      if (empty($value)) {
+        unset($account[$key]);
+      }
+    }
+
+    $userTab = $this->parent->parent->getBaseObject();
+    if ($userTab->attributesAccess['userPassword']->getClear() != '') {
+      /* Password was changed so we have the clear text password */
+      $account['password'] = $userTab->attributesAccess['userPassword']->getClear();
+    } else {
+      /* If we donâ€™t, just give the hash */
+      $account['password']      = '';
+      $account['userPassword']  = $userTab->userPassword;
+    }
+
+    return $this->query('CreateAccount', $account);
+  }
+
+  private function updateAccount($infos)
+  {
+    /* Step 1 - We fill $account */
+    $account = $this->getAccountArray($infos);
+
+    /* Step 2 - We compute diff from PARTAGE data */
+    $this->cacheAccount();
+    foreach ($account as $key => $value) {
+      if (isset($this->cacheAccount['account'][$key]) && ($this->cacheAccount['account'][$key] == $value)) {
+        unset($account[$key]);
+      } elseif (!isset($this->cacheAccount['account'][$key]) && empty($value)) {
+        unset($account[$key]);
+      }
+    }
+    /* If value of zimbraAccountStatus is not something we understand, do not touch it (example: closed) */
+    if (isset($this->cacheAccount['account']['zimbraAccountStatus']) && !in_array($this->cacheAccount['account']['zimbraAccountStatus'], array('active', 'locked'))) {
+      unset($account['zimbraAccountStatus']);
+    }
+
+    /* Step 3 - We send update order if diff is not empty */
+    if (!empty($account)) {
+      $account['name'] = $this->account_id;
+      $answer = $this->query('ModifyAccount', $account);
+
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    }
+
+    /* Step 4 - Call SetPassword for password change if needed */
+    $userTab = $this->parent->parent->getBaseObject();
+    if ($userTab->attributesAccess['userPassword']->getClear() != '') {
+      $account = array(
+        'name'      => $this->account_id,
+        'password'  => $userTab->attributesAccess['userPassword']->getClear()
+      );
+      $answer = $this->query('SetPassword', $account);
+
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    }
+
+    return TRUE;
+  }
+
+  public function updateMailbox()
+  {
+    parent::updateMailbox();
+    $servers = static::getMailServers();
+    $infos = $servers[$this->parent->gosaMailServer];
+
+    $this->build_account_id();
+    if (!$this->parent->initially_was_account) {
+      /* Creation */
+      if ($this->account_exists()) {
+        $this->error = _('An account with the same email address already exists in Partage');
+        return FALSE;
+      }
+
+      $answer = $this->createAccount($infos);
+
+      if ($answer === FALSE) {
+        return FALSE;
+      }
+    } else {
+      if ($this->account_id !== $this->initial_account_id) {
+        /* Renaming */
+        if ($this->account_exists()) {
+          $this->error = _('An account with the same email address already exists in Partage');
+          return FALSE;
+        }
+
+        $account = array(
+          'name'    => $this->initial_account_id,
+          'newname' => $this->account_id
+        );
+        $answer = $this->query('RenameAccount', $account);
+
+        if ($answer === FALSE) {
+          return FALSE;
+        }
+
+        if (!$this->updateAccount($infos)) {
+          return FALSE;
+        }
+      } elseif (!$this->account_exists()) {
+        $answer = $this->createAccount($infos);
+
+        if ($answer === FALSE) {
+          return FALSE;
+        }
+      } else {
+        if (!$this->updateAccount($infos)) {
+          return FALSE;
+        }
+      }
+    }
+
+    /* Handle aliases */
+    if (isset($this->parent->attrs['gosaMailAlternateAddress'])) {
+      $initialAliases = $this->parent->attributesAccess['gosaMailAlternateAddress']->getInitialValue();
+      $aliases        = $this->parent->attributesAccess['gosaMailAlternateAddress']->getValue();
+      $remove = array_diff($initialAliases, $aliases);
+      $add    = array_diff($aliases, $initialAliases);
+      foreach ($remove as $alias) {
+        $answer = $this->query('RemoveAccountAlias', array('name' => $this->account_id, 'alias' => $alias));
+        if ($answer === FALSE) {
+          return FALSE;
+        }
+      }
+      foreach ($add as $alias) {
+        $answer = $this->query('AddAccountAlias', array('name' => $this->account_id, 'alias' => $alias));
+        if ($answer === FALSE) {
+          return FALSE;
+        }
+      }
+    }
+    return TRUE;
+  }
+
+  public function deleteMailbox()
+  {
+    parent::deleteMailbox();
+    $servers = static::getMailServers();
+    $infos = $servers[$this->parent->gosaMailServer];
+    $this->account_id = $this->initial_account_id;
+    if ($this->account_exists()) {
+      if ($infos['delete_type'] == 'delete') {
+        $answer = $this->query('DeleteAccount', array('name' => $this->initial_account_id));
+      } elseif ($infos['delete_type'] == 'disable') {
+        $answer = $this->query('ModifyAccount', array('name' => $this->initial_account_id, 'zimbraAccountStatus' => 'closed'));
+      } else {
+        $answer = FALSE;
+        $this->error = _('Invalid value in fdRenaterPartageServerDeletionType');
+      }
+      return ($answer !== FALSE);
+    }
+    return TRUE;
+  }
+
+  /*! \brief  Returns the used quota in MiB
+      @return Integer Quota used.
+   */
+  public function getQuotaUsage()
+  {
+    if ($this->cacheAccount()) {
+      /* Partage sends quota in bytes */
+      return ($this->cachedAccount['account']['used'] / (1024 * 1024));
+    }
+    return parent::getQuotaUsage();
+  }
+
+  /*! \brief  Returns the quota restrictions in MiB.
+      @return Integer Quota restrictions.
+   */
+  public function getQuota($quotaValue)
+  {
+    if ($this->cacheAccount()) {
+      /* Partage sends quota in bytes */
+      return ($this->cachedAccount['account']['quota'] / (1024 * 1024));
+    }
+    return $quotaValue;
+  }
+
+  /*! \brief  Sets the mail quota
+   */
+  public function setQuota($number)
+  {
+    return parent::setQuota($number);
+  }
+
+  public function additionalInformations()
+  {
+    if ($this->cacheAccount()) {
+      $lastlogin = _('Never');
+      if (isset($this->cachedAccount['account']['zimbraLastLogonTimestamp'])) {
+        $date = LdapGeneralizedTime::fromString($this->cachedAccount['account']['zimbraLastLogonTimestamp']);
+        $date->setTimezone(timezone::getDefaultTimeZone());
+        $lastlogin = $date->format('Y-m-d H:i:s');
+      }
+      return array(
+        _('Last login')     => $lastlogin,
+        _('Account status') => (isset($this->cachedAccount['account']['zimbraAccountStatus']) ? $this->cachedAccount['account']['zimbraAccountStatus'] : _('Unknown')),
+      );
+    }
+    return array();
+  }
+
+  static public function get_server_list()
+  {
+    global $config;
+    $serverList = array();
+
+    $ldap = $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    $ldap->search ('(&(objectClass=fdRenaterPartageServer)(fdRenaterPartageServerMailDomain=*))',
+                  array('cn', 'fdRenaterPartageServerUri', 'fdRenaterPartageServerMailDomain', 'fdRenaterPartageServerUserAgent'));
+    while ($attrs = $ldap->fetch()) {
+      unset($attrs['fdRenaterPartageServerMailDomain']['count']);
+      foreach ($attrs['fdRenaterPartageServerMailDomain'] as $domainAndKey) {
+        list($domain, $key, $cosString) = explode(':', $domainAndKey, 3);
+        $cosArray = explode(',', $cosString);
+        foreach ($cosArray as $cos) {
+          list ($cosName, $cosId) = explode('|', $cos);
+          $deleteMode = (isset($attrs['fdRenaterPartageServerDeletionType'][0]) ? $attrs['fdRenaterPartageServerDeletionType'][0] : 'delete');
+          $serverList[$attrs['cn'][0].' - '.$domain.' - '.$cosName] = array(
+            'server_dn'   => $attrs['dn'],
+            'user_agent'  => $attrs['fdRenaterPartageServerUserAgent'][0],
+            'uri'         => $attrs['fdRenaterPartageServerUri'][0],
+            'delete_type' => $deleteMode,
+            'domain'      => $domain,
+            'key'         => $key,
+            'cos_name'    => $cosName,
+            'cos_id'      => $cosId
+          );
+        }
+      }
+    }
+
+    return $serverList;
+  }
+}
+?>
diff --git a/repository/admin/repository/class_repositoryManagement.inc b/repository/admin/repository/class_repositoryManagement.inc
index d8172bc860df1b98d8aff2eefa589533655fb2a8..ea96bd5aac1cc4067c2e541c17aa1dd2a91178db 100644
--- a/repository/admin/repository/class_repositoryManagement.inc
+++ b/repository/admin/repository/class_repositoryManagement.inc
@@ -22,10 +22,6 @@ class repositoryManagement extends simpleManagement
 {
   protected $objectTypes  = array('buildRepository', 'repoDistribution', 'repoSection');
 
-  protected $departmentBrowser      = TRUE;
-  protected $departmentRootVisible  = TRUE;
-  protected $baseMode               = TRUE;
-
   public static function plInfo()
   {
     return array(
@@ -38,7 +34,7 @@ class repositoryManagement extends simpleManagement
         'description'  => _('Repository'),
         'objectClass'  => array('fdBuildRepository', 'fdBuildRepositoryDistribution', 'fdBuildRepositorySection')
       )),
-      'plManages'     => array('repoSection', 'repoDistribution', 'buildRepository'),
+      'plManages'     => array('buildRepository', 'repoDistribution', 'repoSection'),
 
       'plProvidedAcls' => array()
     );
diff --git a/repository/locale/ar/fusiondirectory.po b/repository/locale/ar/fusiondirectory.po
index bbc32fa3f6894e4ba0cc8fa116842c463a648f0e..2d6ac686e336d948a5ec874dfef4e7a834e51b4e 100644
--- a/repository/locale/ar/fusiondirectory.po
+++ b/repository/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ca/fusiondirectory.po b/repository/locale/ca/fusiondirectory.po
index e60f83f7c456ce4e358556bdc7e3c5da7e062808..2bd42e001a45550e6db25f7aac93b9c7596e482a 100644
--- a/repository/locale/ca/fusiondirectory.po
+++ b/repository/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/cs_CZ/fusiondirectory.po b/repository/locale/cs_CZ/fusiondirectory.po
index c20a8bbb2327d7f16e17f25d543110608ba410b2..10648c731e458d80252cdd7bed0c4342feb1e499 100644
--- a/repository/locale/cs_CZ/fusiondirectory.po
+++ b/repository/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,9 +27,9 @@ 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:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
-msgstr "RepozitÃ¡Å™"
+msgstr "repozitÃ¡Å™"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Repository RDN"
@@ -57,7 +58,7 @@ msgstr "VytvoÅ™it repozitÃ¡Å™"
 #: admin/repository/class_repositoryDistribution.inc:60
 #: admin/repository/class_repositorySection.inc:57
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/repository/class_buildRepository.inc:63
 msgid "Unique name for this repository"
@@ -67,7 +68,7 @@ msgstr "JedineÄnÃ½ nÃ¡zev pro tento repozitÃ¡Å™"
 #: admin/repository/class_repositoryDistribution.inc:64
 #: admin/repository/class_repositorySection.inc:61
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/repository/class_buildRepository.inc:67
 msgid "Description of this repository"
@@ -83,7 +84,7 @@ msgstr "Sekce distribuce, kterÃ© tento repozitÃ¡Å™ poskytuje"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Private"
-msgstr "SoukromÃ©"
+msgstr "soukromÃ©"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Is this repository private or public?"
@@ -91,7 +92,7 @@ msgstr "Je tento repozitÃ¡Å™ soukromÃ½ nebo veÅ™ejnÃ½?"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Repository type"
@@ -99,11 +100,11 @@ msgstr "Typ repozitÃ¡Å™e"
 
 #: admin/repository/class_buildRepository.inc:89
 msgid "Members"
-msgstr "ÄŒlenovÃ©"
+msgstr "ÄlenovÃ©"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins"
-msgstr "SprÃ¡vci"
+msgstr "sprÃ¡vci"
 
 #: admin/repository/class_buildRepository.inc:92
 msgid "Admins of this repository"
@@ -119,14 +120,14 @@ msgstr "Kdo do tohoto repozitÃ¡Å™e nahrÃ¡vÃ¡ data"
 
 #: admin/repository/class_buildRepository.inc:100
 msgid "Users"
-msgstr "UÅ¾ivatelÃ©"
+msgstr "uÅ¾ivatelÃ©"
 
 #: admin/repository/class_buildRepository.inc:100
 msgid "Users of this repository"
 msgstr "UÅ¾ivatelÃ© tohoto repozitÃ¡Å™e"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr "SprÃ¡va repozitÃ¡Å™e"
 
@@ -147,7 +148,7 @@ msgstr "Popis tÃ©to distribuce"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
-msgstr "Sekce"
+msgstr "sekce"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
diff --git a/repository/locale/de/fusiondirectory.po b/repository/locale/de/fusiondirectory.po
index 09d1ae4d099464d5f1b760ee99d4991d294aa04e..5d995f27e220f27ca6d97f62cf212459bd960d06 100644
--- a/repository/locale/de/fusiondirectory.po
+++ b/repository/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Repository"
 
@@ -125,8 +126,8 @@ msgstr "Benutzer"
 msgid "Users of this repository"
 msgstr "Benutzer dieses Repositoriums"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr "Repositoriumsverwaltung"
 
diff --git a/repository/locale/el_GR/fusiondirectory.po b/repository/locale/el_GR/fusiondirectory.po
index c8f6dc96ac57d33604a7a5cc94217b2269df477d..a5d75b519cf414842cf3115ce789e8d97d185e92 100644
--- a/repository/locale/el_GR/fusiondirectory.po
+++ b/repository/locale/el_GR/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
-# Susanna <susannategou@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Î¿Ï… Ï„Î¿Ï… Î±Ï€Î¿Î¸ÎµÏ„Î·ÏÎ¯Î¿Ï… FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Î‘Ï€Î¿Î¸ÎµÏ„Î®ÏÎ¹Î¿"
 
@@ -128,8 +126,8 @@ msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚"
 msgid "Users of this repository"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚ Ï„Î¿Ï… Î±Ï€Î¿Î¸ÎµÏ„Î·ÏÎ¯Î¿Ï…"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î±Ï€Î¿Î¸ÎµÏ„Î·ÏÎ¯Î¿Ï…"
 
diff --git a/repository/locale/en/fusiondirectory.po b/repository/locale/en/fusiondirectory.po
index 9c1bfb8fec2871163dd88efeb796d67d6f346549..0389097a955e5a427c95a3778ac147113eae2de8 100644
--- a/repository/locale/en/fusiondirectory.po
+++ b/repository/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/es/fusiondirectory.po b/repository/locale/es/fusiondirectory.po
index 4b9fa6225e033f1cecd6d70288bb7239351dd833..0c26262fc602827b7f56f092240864790842637d 100644
--- a/repository/locale/es/fusiondirectory.po
+++ b/repository/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -125,8 +126,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/es_CO/fusiondirectory.po b/repository/locale/es_CO/fusiondirectory.po
index 5feb92f8c639ff83eb720d558ab6f86b661efc88..d4207e8dbfe0244d86019c19fa71fbc826d5e86e 100644
--- a/repository/locale/es_CO/fusiondirectory.po
+++ b/repository/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/es_VE/fusiondirectory.po b/repository/locale/es_VE/fusiondirectory.po
index 249b7537adf0f309129e5b05bcbf007745185019..b335c65dc2173f572887d705fbba6331c402e9c6 100644
--- a/repository/locale/es_VE/fusiondirectory.po
+++ b/repository/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -125,8 +126,8 @@ msgstr "Usuarios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fa_IR/fusiondirectory.po b/repository/locale/fa_IR/fusiondirectory.po
index 062c10cf1548142a20dda7ff61dfef0af2375c7b..0b155f542d1a80fd685ede894e11d6470fcaf564 100644
--- a/repository/locale/fa_IR/fusiondirectory.po
+++ b/repository/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fi_FI/fusiondirectory.po b/repository/locale/fi_FI/fusiondirectory.po
index 6a8362ffd08850ff92bd76b5f678834a70172da6..ab4be852cf86f03683b65a033826aef8196a23fc 100644
--- a/repository/locale/fi_FI/fusiondirectory.po
+++ b/repository/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/fr/fusiondirectory.po b/repository/locale/fr/fusiondirectory.po
index b46757810d7527c62e35734ed8dcc589b619bf91..70e2905a6646f6586e573bc9c354a175920b8103 100644
--- a/repository/locale/fr/fusiondirectory.po
+++ b/repository/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,24 +20,24 @@ msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:28
 msgid "Repository configuration"
-msgstr "Configuration de repository"
+msgstr "Configuration des dÃ©pÃ´ts"
 
 #: config/repository/class_repositoryConfig.inc:29
 msgid "FusionDirectory repository plugin configuration"
 msgstr "Configuration du plugin repository"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "DÃ©pÃ´t"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Repository RDN"
-msgstr "Branche des dÃ©pÃ´ts"
+msgstr "RDN Repository"
 
 #: config/repository/class_repositoryConfig.inc:45
 msgid "Branch in which repository objects will be stored"
-msgstr "Branche oÃ¹ seront stockÃ©s les objets dÃ©pÃ´ts"
+msgstr "Branche oÃ¹ seront stockÃ©s les objets dÃ©pots"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Repository types"
@@ -45,14 +45,14 @@ msgstr "Types de dÃ©pÃ´t"
 
 #: config/repository/class_repositoryConfig.inc:51
 msgid "Available repository types"
-msgstr "Type de dÃ©pÃ´ts disponibles"
+msgstr "Type de tests disponibles"
 
 #: admin/repository/class_buildRepository.inc:30
 #: admin/repository/class_buildRepository.inc:31
 #: admin/repository/class_buildRepository.inc:33
 #: admin/repository/class_buildRepository.inc:59
 msgid "Build repository"
-msgstr "DÃ©pÃ´t de construction"
+msgstr "Construire un dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:63
 #: admin/repository/class_repositoryDistribution.inc:60
@@ -76,7 +76,7 @@ msgstr "Description de ce dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "Distribution sections"
-msgstr "Sections de la distribution"
+msgstr "Section du dÃ©pÃ´t"
 
 #: admin/repository/class_buildRepository.inc:72
 msgid "The distribution sections this repository provides"
@@ -88,7 +88,7 @@ msgstr "PrivÃ©"
 
 #: admin/repository/class_buildRepository.inc:78
 msgid "Is this repository private or public?"
-msgstr "Ce dÃ©pÃ´t est-il privÃ© ou publicâ€¯?"
+msgstr "Ce dÃ©pÃ´t est privÃ© ou public?"
 
 #: admin/repository/class_buildRepository.inc:82
 msgid "Type"
@@ -126,10 +126,10 @@ msgstr "Utilisateurs"
 msgid "Users of this repository"
 msgstr "Utilisateurs de ce dÃ©pÃ´t"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
-msgstr "Gestion des dÃ©pÃ´ts"
+msgstr "Gestion des dÃ©pots"
 
 #: admin/repository/class_repositoryDistribution.inc:30
 #: admin/repository/class_repositoryDistribution.inc:31
@@ -144,7 +144,7 @@ msgstr "Nom unique pour cette distribution"
 
 #: admin/repository/class_repositoryDistribution.inc:64
 msgid "Description of this distribution"
-msgstr "Description de cette distribution"
+msgstr "Description pour cette distribution"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
@@ -152,16 +152,16 @@ msgstr "Section"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "The sections this distribution contains"
-msgstr "Les sections que cette distribution contient"
+msgstr "Les section que cette distribution contient"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 #: admin/repository/class_repositorySection.inc:66
 msgid "Based on"
-msgstr "BasÃ© sur"
+msgstr "basÃ© sur"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 msgid "The distributions this one is based on"
-msgstr "Les distributions sur lesquelles celle ci est basÃ©e"
+msgstr "Les distributions dont celui-ci est basÃ© sur"
 
 #: admin/repository/class_repositorySection.inc:30
 #: admin/repository/class_repositorySection.inc:31
@@ -176,8 +176,8 @@ msgstr "Nom unique pour cette section"
 
 #: admin/repository/class_repositorySection.inc:61
 msgid "Description of this section"
-msgstr "Description de cette section"
+msgstr "Description pour cette section"
 
 #: admin/repository/class_repositorySection.inc:66
 msgid "The sections this one is based on"
-msgstr "Les sections sur lesquelles celle-ci est basÃ©e"
+msgstr "Les sections dont celui-ci est basÃ© sur"
diff --git a/repository/locale/hu_HU/fusiondirectory.po b/repository/locale/hu_HU/fusiondirectory.po
index 6eab36e3c4075d12423a0ca1dc74caf762a9c13f..1b21e65555026f7b652cc8dfea932ca4c63e419d 100644
--- a/repository/locale/hu_HU/fusiondirectory.po
+++ b/repository/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr "FelhasznÃ¡lÃ³k"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/id/fusiondirectory.po b/repository/locale/id/fusiondirectory.po
index f5d4394506ec972ae1d792b845e907475977808b..6398f79cb35daf3f467cc1d3cf36baec55463db5 100644
--- a/repository/locale/id/fusiondirectory.po
+++ b/repository/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/it_IT/fusiondirectory.po b/repository/locale/it_IT/fusiondirectory.po
index ab7ec935746a24e69c2f6c2fc90c6938a4997cff..b55019d2378512191509ebf0142fb12f6eb63bde 100644
--- a/repository/locale/it_IT/fusiondirectory.po
+++ b/repository/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:27+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr "Configurazione del plugin Repository di FusionDirectory"
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Deposito"
 
@@ -128,8 +126,8 @@ msgstr "Utenti"
 msgid "Users of this repository"
 msgstr "Utenti di questo repository"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr "Gestione di Repository"
 
diff --git a/repository/locale/lv/fusiondirectory.po b/repository/locale/lv/fusiondirectory.po
index 293ec535d84a43e8b2078bb2b95ee341cc95fe94..caa26adc5cde36d76893fb062dfcf2c7d31cb82c 100644
--- a/repository/locale/lv/fusiondirectory.po
+++ b/repository/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "KrÄtuve "
 
@@ -125,8 +126,8 @@ msgstr "LietotÄji"
 msgid "Users of this repository"
 msgstr "Å Ä«s krÄtuves lietotÄji"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/nb/fusiondirectory.po b/repository/locale/nb/fusiondirectory.po
index e21eff551e0e32d7934693b89096505435b31b7e..371a4f2b8b8d1c88df177687b53209beead8b27b 100644
--- a/repository/locale/nb/fusiondirectory.po
+++ b/repository/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/nl/fusiondirectory.po b/repository/locale/nl/fusiondirectory.po
index f7a82996d1786617a698dc6fb860d5f50feb5c39..1a35f598813c4b19b41173f64343d97eb3bea0df 100644
--- a/repository/locale/nl/fusiondirectory.po
+++ b/repository/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Verzamelplaats"
 
@@ -125,8 +126,8 @@ msgstr "Gebruikers"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
@@ -139,11 +140,11 @@ msgstr ""
 
 #: admin/repository/class_repositoryDistribution.inc:60
 msgid "Unique name for this distribution"
-msgstr ""
+msgstr "Unieke naam voor deze distributie"
 
 #: admin/repository/class_repositoryDistribution.inc:64
 msgid "Description of this distribution"
-msgstr ""
+msgstr "Beschrijving van deze distributie"
 
 #: admin/repository/class_repositoryDistribution.inc:69
 msgid "Section"
@@ -156,7 +157,7 @@ msgstr ""
 #: admin/repository/class_repositoryDistribution.inc:76
 #: admin/repository/class_repositorySection.inc:66
 msgid "Based on"
-msgstr ""
+msgstr "Gebaseerd op"
 
 #: admin/repository/class_repositoryDistribution.inc:76
 msgid "The distributions this one is based on"
@@ -171,7 +172,7 @@ msgstr ""
 
 #: admin/repository/class_repositorySection.inc:57
 msgid "Unique name for this section"
-msgstr ""
+msgstr "Unieke naam voor deze sectie"
 
 #: admin/repository/class_repositorySection.inc:61
 msgid "Description of this section"
diff --git a/repository/locale/pl/fusiondirectory.po b/repository/locale/pl/fusiondirectory.po
index 515b1e09b88a49c77b785d9649bbfd3d3d30f347..d49751654f481df8a4019773302826e69c1f7fc9 100644
--- a/repository/locale/pl/fusiondirectory.po
+++ b/repository/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "Repozytorium"
 
@@ -125,8 +126,8 @@ msgstr "UÅ¼ytkownicy"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/pt/fusiondirectory.po b/repository/locale/pt/fusiondirectory.po
index 031ea09b8f3265dc0db1d830f6c4e3d313b6ab41..42d8a143cc7cdf79e0132aa7c01b740a4a9e328a 100644
--- a/repository/locale/pt/fusiondirectory.po
+++ b/repository/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr "UsuÃ¡rios"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/pt_BR/fusiondirectory.po b/repository/locale/pt_BR/fusiondirectory.po
index ae8cd7da5917edefbcad3da7d4bb59a821545d32..c344cf4cfe0cd140c6d6f75b9fb04326e39be91e 100644
--- a/repository/locale/pt_BR/fusiondirectory.po
+++ b/repository/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,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:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "RepositÃ³rio"
 
@@ -125,8 +126,8 @@ msgstr "UsuÃ¡rios"
 msgid "Users of this repository"
 msgstr "UsuÃ¡rios deste repositÃ³rio"
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr "Gerenciamento de repositÃ³rio"
 
diff --git a/repository/locale/ru/fusiondirectory.po b/repository/locale/ru/fusiondirectory.po
index 1fd7799220fefb76ed052f43b8cfd77e7c5f3ada..40df7ec5be020c8a38bd666cd59285f723288607 100644
--- a/repository/locale/ru/fusiondirectory.po
+++ b/repository/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ru@petr1708/fusiondirectory.po b/repository/locale/ru@petr1708/fusiondirectory.po
index 5fe13e2cecdd587e8625e25e1ccdc658bdcfa0c9..475a088a7b3ca9adcd20c265e578d7f8e7b324b3 100644
--- a/repository/locale/ru@petr1708/fusiondirectory.po
+++ b/repository/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/sv/fusiondirectory.po b/repository/locale/sv/fusiondirectory.po
index a5c669f494a946266fa4be06c95ff6db2c11c032..c03544962348b83c2786030dfe654c250d264a77 100644
--- a/repository/locale/sv/fusiondirectory.po
+++ b/repository/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "FÃ¶rrÃ¥d"
 
@@ -125,8 +126,8 @@ msgstr "AnvÃ¤ndare"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/ug/fusiondirectory.po b/repository/locale/ug/fusiondirectory.po
index 621f8a5819e1e623cf698b6f491ac9d91f974ff1..751aa7af4e060d8d3a9d7d66d8726208e88cb0ab 100644
--- a/repository/locale/ug/fusiondirectory.po
+++ b/repository/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +125,8 @@ msgstr ""
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/vi_VN/fusiondirectory.po b/repository/locale/vi_VN/fusiondirectory.po
index 510a95542fc8bd95a167be982b6c61269e7eac13..9e2bbfcdaadc3122906ab8bfbe2cb28efd91b4ed 100644
--- a/repository/locale/vi_VN/fusiondirectory.po
+++ b/repository/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr ""
 
@@ -125,8 +126,8 @@ msgstr "NgÆ°á»i dÃ¹ng"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/repository/locale/zh/fusiondirectory.po b/repository/locale/zh/fusiondirectory.po
index dd3e7fa53c878a61b9ff1e9920704fad2cafcc28..c0fcd140439cd0185359324049a2df0a6c6c75f5 100644
--- a/repository/locale/zh/fusiondirectory.po
+++ b/repository/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "FusionDirectory repository plugin configuration"
 msgstr ""
 
 #: config/repository/class_repositoryConfig.inc:42
-#: admin/repository/class_repositoryManagement.inc:38
+#: admin/repository/class_repositoryManagement.inc:34
 msgid "Repository"
 msgstr "ä»“åº“"
 
@@ -125,8 +126,8 @@ msgstr "ç”¨æˆ·"
 msgid "Users of this repository"
 msgstr ""
 
-#: admin/repository/class_repositoryManagement.inc:32
-#: admin/repository/class_repositoryManagement.inc:33
+#: admin/repository/class_repositoryManagement.inc:28
+#: admin/repository/class_repositoryManagement.inc:29
 msgid "Repository management"
 msgstr ""
 
diff --git a/samba/admin/groups/samba/class_sambaGroup.inc b/samba/admin/groups/samba/class_sambaGroup.inc
index 0141cda37b98bc2ccfe5d8cd6085182b2392bef3..acd127df8cfb7a67a20ab4daab9007028139cd03 100644
--- a/samba/admin/groups/samba/class_sambaGroup.inc
+++ b/samba/admin/groups/samba/class_sambaGroup.inc
@@ -121,8 +121,6 @@ class sambaGroup extends simplePlugin
       );
     }
     $this->attributesAccess['sambaSID']->attributes[1]->setInitialValue($this->getGID());
-
-    $this->updateAttributesValues();
   }
 
   function prepare_save()
@@ -160,7 +158,7 @@ class sambaGroup extends simplePlugin
     if (class_available('mixedGroup')) {
       $gidNumber  = $this->parent->by_object['mixedGroup']->gidNumber;
     } else {
-      $gidNumber  = $this->parent->by_object['group']->gidNumber;
+      $gidNumber  = $this->parent->by_object['posixGroup']->gidNumber;
     }
     do {
       $sid = $this->getSID()."-".($gidNumber * 2 + $this->getRidBase() + 1);
diff --git a/samba/admin/samba/class_sambaDomainManagement.inc b/samba/admin/samba/class_sambaDomainManagement.inc
index 47b8c84192ba66c7964a28aabe5eaef5c4e68d0d..b1fe22b415cc44214aa82447f224eb3cce904eab 100644
--- a/samba/admin/samba/class_sambaDomainManagement.inc
+++ b/samba/admin/samba/class_sambaDomainManagement.inc
@@ -20,6 +20,7 @@
 
 class sambaDomainManagement extends simpleManagement
 {
+  // Tab definition
   protected $objectTypes  = array('sambaDomain');
 
   protected $departmentBrowser      = FALSE;
diff --git a/samba/admin/systems/samba/class_argonautEventSambaShares.inc b/samba/admin/systems/samba/class_argonautEventSambaShares.inc
index c538d065c87a8b7370712870524fd2a9f254427b..987e83dcaae5af0d76956190fb3a57bf6fdfcc20 100644
--- a/samba/admin/systems/samba/class_argonautEventSambaShares.inc
+++ b/samba/admin/systems/samba/class_argonautEventSambaShares.inc
@@ -18,9 +18,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class argonautEventSambaShares extends argonautEventTypes
+class argonautEventTypesSambaShares
 {
-  static protected function get_event_types_list()
+  static public function get_event_types_list()
   {
     return array(
       'SambaShares.start' => array(
diff --git a/samba/admin/systems/samba/class_sambaSystemTab.inc b/samba/admin/systems/samba/class_sambaSystemTab.inc
new file mode 100644
index 0000000000000000000000000000000000000000..ee339a1e4779dfaac69a53b30cc259188b54cbe7
--- /dev/null
+++ b/samba/admin/systems/samba/class_sambaSystemTab.inc
@@ -0,0 +1,138 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2003-2010  Cajus Pollmeier
+  Copyright (C) 2011-2017  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  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 sambaSystemTab extends simplePlugin
+{
+  var $objectclasses = array('posixAccount','sambaSamAccount');
+  var $displayHeader = TRUE;
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('Samba'),
+      'plDescription' => _('Windows workstation information'),
+      'plSelfModify'  => FALSE,
+      'plObjectType'  => array('workstation'),
+      'plPriority'    => 5,
+
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+    );
+  }
+
+  static function getAttributesInfo ($word = NULL, $rdn = NULL)
+  {
+    return array(
+      'main' => array(
+        'name'  => _('Properties'),
+        'attrs' => array(
+          new HiddenAttribute ('uid'),
+          new HiddenAttribute ('sambaSID'),
+          new HiddenAttribute ('homeDirectory', TRUE, '/dev/null'),
+          new HiddenAttribute ('uidNumber', TRUE, 1000),
+          new HiddenAttribute ('gidNumber', TRUE, 515),
+          new HiddenAttribute ('sambaAcctFlags', TRUE, '[W          ]'),
+          new SelectAttribute (
+            _('Domain'), _('Samba domain name'),
+            'sambaDomainName', TRUE
+          ),
+        )
+      ),
+    );
+  }
+
+  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
+  {
+    global $config;
+    parent::__construct($dn, $object, $parent, $mainTab);
+
+    $this->attributesAccess['uid']->setUnique(TRUE);
+    $this->attributesAccess['sambaDomainName']->setChoices(array_keys($config->data['SERVERS']['SAMBA']));
+    $this->attributesAccess['sambaDomainName']->setInLdap(FALSE);
+
+    // Get samba domain and its sid/rid base
+    if ($this->sambaSID != '') {
+      $this->SID = preg_replace ('/-[^-]+$/', '', $this->sambaSID);
+      $ldap = $config->get_ldap_link();
+      $ldap->cd($config->current['BASE']);
+      $ldap->search('(&(objectClass=sambaDomain)(sambaSID='.$this->SID.'))', array('sambaAlgorithmicRidBase','sambaDomainName'));
+      if ($ldap->count() != 0) {
+        $attrs = $ldap->fetch();
+        if (isset($attrs['sambaAlgorithmicRidBase'])) {
+          $this->ridBase = $attrs['sambaAlgorithmicRidBase'][0];
+        } else {
+          $this->ridBase = $config->get_cfg_value('sambaRidBase');
+        }
+        if ($this->sambaDomainName == '') {
+          $this->sambaDomainName = $attrs['sambaDomainName'][0];
+        }
+      } else {
+        // Fall back to a 'DEFAULT' domain, if none was found in LDAP.
+        if ($this->sambaDomainName == '') {
+          $this->sambaDomainName = 'DEFAULT';
+        }
+
+        // Nothing in ldap, use configured sid and rid values.
+        $this->ridBase  = $config->get_cfg_value('sambaRidBase');
+        $this->SID      = $config->get_cfg_value('sambaSid');
+      }
+    }
+  }
+
+  protected function update_uid()
+  {
+    $this->attributesAccess['uid']->setValue($this->parent->getBaseObject()->cn.'$');
+  }
+
+  function save_object()
+  {
+    parent::save_object();
+    $this->update_uid();
+  }
+
+  function prepare_save()
+  {
+    global $config;
+    $this->update_uid();
+    parent::prepare_save();
+
+    // Check if the sambaSID exist and that it is correct
+    // If not get it from config and generate a new sid
+
+    if (($this->sambaSID == '') || (substr_count($this->sambaSID, '-') < 7)) {
+      $this->SID      = $config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['SID'];
+      $this->ridBase  = $config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['RIDBASE'];
+
+      // create sambaSID for workstation
+      $uidNumber = $this->uidNumber;
+      do {
+        $sid = $this->SID.'-'.($uidNumber * 2 + $this->ridBase);
+        $ldap = $config->get_ldap_link();
+        $ldap->cd($config->current['BASE']);
+        $ldap->search('(sambaSID='.$sid.')', array('sambaSID'));
+        $uidNumber++;
+      } while ($ldap->count() != 0);
+      $uidNumber--;
+      $this->attrs['sambaSID']  = $sid;
+      $this->attrs['uidNumber'] = $uidNumber + $this->ridBase;
+    }
+  }
+}
+?>
diff --git a/samba/admin/systems/samba/class_winstationGeneric.inc b/samba/admin/systems/samba/class_winstationGeneric.inc
deleted file mode 100644
index 7b6d9d170c1c639fca45bf65339c4012d79c5e6f..0000000000000000000000000000000000000000
--- a/samba/admin/systems/samba/class_winstationGeneric.inc
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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 winstationGeneric extends systemSimplePluginGlue
-{
-  var $mainTab = TRUE;
-
-  var $netConfigDNS;
-
-  var $objectclasses = array('posixAccount','account','sambaSamAccount','top');
-
-  var $preInitAttributes = array('uid', 'cn', 'networkSettings');
-
-  /* Return plugin information for acl handling */
-  static function plInfo()
-  {
-    return array(
-      'plShortName'   => _('Winstation'),
-      'plDescription' => _('Windows workstation information'),
-      'plSelfModify'  => FALSE,
-      'plObjectType'  => array(
-        'winstation' => array(
-          'name'        => _('Windows workstation'),
-          'description' => _('Windows workstation'),
-          'filter'      => '(&(objectClass=sambaSamAccount)(uid=*$))',
-          'icon'        => 'geticon.php?context=devices&icon=computer-windows&size=16',
-          'ou'          => get_ou('sambaMachineAccountRDN'),
-        )
-      ),
-
-      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
-    );
-  }
-
-  /*!
-   *  \brief The main function : information about attributes
-   */
-  static function getAttributesInfo ($word = NULL, $rdn = NULL)
-  {
-    return array(
-      'main' => array(
-        'name'  => _('Properties'),
-        'attrs' => array(
-          new HiddenAttribute ('uid'),
-          new HiddenAttribute ('homeDirectory', TRUE, '/dev/null'),
-          new HiddenAttribute ('sambaSID'),
-          new HiddenAttribute ('uidNumber', TRUE, 1000),
-          new HiddenAttribute ('gidNumber', TRUE, 515),
-          new HiddenAttribute ('sambaAcctFlags', TRUE, "[W          ]"),
-          new CompositeAttribute (
-            _('The name of the winstation'),
-            'cn',
-            array(
-              new HostNameAttribute (
-                _('Name'), _('The name of the winstation'),
-                'cn_field', TRUE
-              ),
-            ),
-            '/^([^\\$]+)\\$$/', '%s$'
-          ),
-          new StringAttribute (
-            _('Description'), _('A short description of the winstation'),
-            'description', FALSE
-          ),
-          new SelectAttribute (
-            _('Domain'), _('Samba domain name'),
-            'sambaDomainName', TRUE
-          ),
-          new StringAttribute (
-            _('Location'), _('The location of the winstation'),
-            'l', FALSE
-          ),
-          new BaseSelectorAttribute(get_winstations_ou()),
-        )
-      ),
-      'network' => array(
-        'name'      => _('Network settings'),
-        'attrs'     => array(new NetworkSettingsAttribute('uid', array('ipHost', 'ieee802Device'))),
-        'template'  => get_template_path('../network_section.tpl', TRUE, dirname(__FILE__)),
-        'icon'      => 'geticon.php?context=categories&icon=applications-internet&size=16',
-      ),
-    );
-  }
-
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
-  {
-    global $config;
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['cn']->setUnique(TRUE);
-    $this->attributesAccess['uid']->setUnique(TRUE);
-    $this->attributesAccess['sambaDomainName']->setChoices(array_keys($config->data['SERVERS']['SAMBA']));
-    $this->attributesAccess['sambaDomainName']->setInLdap(FALSE);
-
-    // Get samba domain and its sid/rid base
-    if ($this->sambaSID != "") {
-      $this->SID = preg_replace ("/-[^-]+$/", "", $this->sambaSID);
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search("(&(objectClass=sambaDomain)(sambaSID=$this->SID))", array("sambaAlgorithmicRidBase","sambaDomainName"));
-      if ($ldap->count() != 0) {
-        $attrs = $ldap->fetch();
-        if (isset($attrs['sambaAlgorithmicRidBase'])) {
-          $this->ridBase = $attrs['sambaAlgorithmicRidBase'][0];
-        } else {
-          $this->ridBase = $config->get_cfg_value("sambaRidBase");
-        }
-        if ($this->sambaDomainName == "") {
-          $this->sambaDomainName = $attrs['sambaDomainName'][0];
-        }
-      } else {
-        // Fall back to a 'DEFAULT' domain, if none was found in LDAP.
-        if ($this->sambaDomainName == "") {
-          $this->sambaDomainName = "DEFAULT";
-        }
-
-        // Nothing in ldap, use configured sid and rid values.
-        $this->ridBase  = $config->get_cfg_value("sambaRidBase");
-        $this->SID      = $config->get_cfg_value("sambaSid");
-      }
-    }
-  }
-
-  function save_object()
-  {
-    parent::save_object();
-    $this->attributesAccess['uid']->setValue($this->attributesAccess['cn']->getValue());
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-    $this->netConfigDNS->resetCopyInfos();
-  }
-
-  function set_acl_base($base)
-  {
-    parent::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    parent::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
-  }
-
-  function remove_from_parent()
-  {
-    global $config;
-    if (!$this->initially_was_account) {
-      return;
-    }
-
-    if ($this->acl_is_removeable()) {
-      $this->netConfigDNS->remove_from_parent();
-
-      parent::remove_from_parent();
-
-      /* Delete references to object groups */
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search("(&(objectClass=gosaGroupOfNames)(member=".ldap_escape_f($this->dn)."))", array("cn"));
-      while ($ldap->fetch()) {
-        $og = new ogroup($ldap->getDN());
-        unset($og->member[$this->dn]);
-        $og->save();
-      }
-    }
-  }
-
-  function prepare_save()
-  {
-    global $config;
-    $this->attributesAccess['uid']->setValue($this->attributesAccess['cn']->getValue());
-    parent::prepare_save();
-
-    //verify that the $this->sambaSID exist and that it is correct
-    //yes do nothing
-    //no get it from config and generate a new sid
-
-    if (($this->sambaSID == "") || (substr_count($this->sambaSID, "-" ) < 7)) {
-      $this->SID      = $config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['SID'];
-      $this->ridBase  = $config->data['SERVERS']['SAMBA'][$this->sambaDomainName]['RIDBASE'];
-
-      // create sambaSID for workstation
-      $uidNumber = $this->uidNumber;
-      do {
-        $sid = $this->SID."-".($uidNumber * 2 + $this->ridBase);
-        $ldap = $config->get_ldap_link();
-        $ldap->cd($config->current['BASE']);
-        $ldap->search("(sambaSID=$sid)", array("sambaSID"));
-        $uidNumber++;
-      } while ($ldap->count() != 0);
-      $uidNumber--;
-      $this->attrs['sambaSID']  = $sid;
-      $this->attrs['uidNumber'] = $uidNumber + $this->ridBase;
-    }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    parent::ldap_save($cleanup);
-    $this->netConfigDNS->cn = preg_replace("/\\\$\$/", "", $this->cn);
-    $this->netConfigDNS->save();
-  }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog);
-  }
-
-  function compute_dn()
-  {
-    $this->attributesAccess['uid']->setValue($this->attributesAccess['cn']->getValue());
-    return 'uid='.ldap_escape($this->attributesAccess['uid']->getValue(), '', LDAP_ESCAPE_DN).','.get_winstations_ou().$this->base;
-  }
-}
-?>
diff --git a/samba/config/samba/class_sambaPluginConfig.inc b/samba/config/samba/class_sambaPluginConfig.inc
index 48786fb7e4b1b5b1b02f13689c257f73d266a330..55723a6363b1847c1ea9b35cafb5fa433f73672f 100644
--- a/samba/config/samba/class_sambaPluginConfig.inc
+++ b/samba/config/samba/class_sambaPluginConfig.inc
@@ -20,17 +20,17 @@
 
 class sambaPluginConfig extends simplePlugin
 {
-  var $objectclasses  = array("fdSambaPluginConf");
+  var $objectclasses  = array('fdSambaPluginConf');
 
   static function plInfo()
   {
     return array(
-      "plShortName"     => _("Samba"),
-      "plDescription"   => _("Samba plugin configuration"),
-      "plPriority"      => 2,
-      "plObjectType"    => array("configuration"),
+      'plShortName'     => _('Samba'),
+      'plDescription'   => _('Samba plugin configuration'),
+      'plPriority'      => 2,
+      'plObjectType'    => array('configuration'),
 
-      "plProvidedAcls"  => parent::generatePlProvidedAcls(static::getAttributesInfo())
+      'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
 
@@ -40,11 +40,6 @@ class sambaPluginConfig extends simplePlugin
       'samba' => array(
         'name'  => _('Samba settings'),
         'attrs' => array(
-          new StringAttribute (
-            _('Samba machine account RDN'), _('The location where FusionDirectory looks for new samba workstations.'),
-            'fdSambaMachineAccountRDN', FALSE,
-            'ou=computers,ou=systems'
-          ),
           new BooleanAttribute (
             _('Samba ID mapping'),
             _('Maintain sambaIdmapEntry objects. Depending on your setup this can drastically improve the windows login performance.'),
diff --git a/samba/locale/ar/fusiondirectory.po b/samba/locale/ar/fusiondirectory.po
index a35e845e2cd07967aaac168624346861dc7e4416..59625ee82e8b54bdf916d19608b783a432faf759 100644
--- a/samba/locale/ar/fusiondirectory.po
+++ b/samba/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Ø§Ù„Ø®ÙˆØ§Øµ"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Ø§Ù„Ø¥Ø³Ù…"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Ø§Ù„ÙˆØµÙ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/ca/fusiondirectory.po b/samba/locale/ca/fusiondirectory.po
index db46c749fe7d797067f91ee00ab48ffb4df33616..39558997e0430a63781850003de6ac771c1484da 100644
--- a/samba/locale/ca/fusiondirectory.po
+++ b/samba/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "AvÃs"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalitzaciÃ³"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/cs_CZ/fusiondirectory.po b/samba/locale/cs_CZ/fusiondirectory.po
index 1de5b26ff74540b0d8372504ad9ccd73ca493afa..f999c4386c6e903056a0f7bbea854e064558c598 100644
--- a/samba/locale/cs_CZ/fusiondirectory.po
+++ b/samba/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "VaÅ¡e instalace PHP neobsahuje mhash() ani funkci hash. Nelze tedy vytvÃ¡Å™et otisky algoritmem MD4."
+msgstr ""
+"VaÅ¡e instalace PHP neobsahuje mhash() ani funkci hash. Nelze tedy vytvÃ¡Å™et "
+"otisky algoritmem MD4."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -30,13 +33,14 @@ msgstr "Samba â€“ pÅ™Ãstup pÅ™es vytÃ¡ÄenÃ© spojenÃ"
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
 #: personal/samba/class_sambaAccount.inc:159
 #: config/samba/class_sambaPluginConfig.inc:41
 msgid "Samba settings"
-msgstr "NastavenÃ pro Samba"
+msgstr "nastavenÃ Samby"
 
 #: personal/samba/class_sambaAccount.inc:183
 msgid "Samba profile"
@@ -55,7 +59,7 @@ msgstr "PÃsmenko domovskÃ©ho disku"
 #: personal/samba/class_sambaAccount.inc:194
 #: personal/samba/class_sambaAccount.inc:227
 msgid "Home directory path"
-msgstr "UmÃstÄ›nÃ domovskÃ© sloÅ¾ky"
+msgstr "Cesta k domovskÃ© sloÅ¾ce"
 
 #: personal/samba/class_sambaAccount.inc:194
 #: personal/samba/class_sambaAccount.inc:227
@@ -65,27 +69,27 @@ msgstr "UmÃstÄ›nÃ (v UNC zÃ¡pisu) domovskÃ©ho disku"
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
-msgstr "DomÃ©na"
+msgstr "domÃ©na"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "nÃ¡zev domÃ©ny Samba"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
-msgstr "UmÃstÄ›nÃ skriptu"
+msgstr "cesta ke skriptu"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Login script path"
-msgstr "UmÃstÄ›nÃ skriptu, spouÅ¡tÄ›nÃ©ho pÅ™i pÅ™ihlÃ¡Å¡ovÃ¡nÃ"
+msgstr "Cesta ke skriptu po spuÅ¡tÄ›nÃ"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
 msgid "Profile path"
-msgstr "UmÃstÄ›nÃ profilu"
+msgstr "cesta k profilu"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
@@ -94,15 +98,15 @@ msgstr "Cesta k profilu v UNC zÃ¡pisu"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Terminal server"
-msgstr "TerminÃ¡lovÃ½ server"
+msgstr "terminÃ¡lovÃ½ server"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Allow login on terminal server"
-msgstr "UmoÅ¾nit pÅ™ihlaÅ¡ovÃ¡nÃ k terminÃ¡lovÃ©mu serveru"
+msgstr "povolit pÅ™ihlaÅ¡ovÃ¡nÃ k terminÃ¡lovÃ©mu serveru"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client config"
-msgstr "PÅ™evzÃt nastavenÃ klienta"
+msgstr "zdÄ›dit nastavenÃ klienta"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client configuration"
@@ -118,7 +122,7 @@ msgstr "Program, kterÃ½ spustit po navÃ¡zÃ¡nÃ spojenÃ"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Working directory"
-msgstr "PracovnÃ sloÅ¾ka"
+msgstr "pracovnÃ adresÃ¡Å™"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Basic working directory"
@@ -146,7 +150,9 @@ msgstr "NejdelÅ¡Ã pÅ™ijatelnÃ¡ doba neÄinnosti"
 
 #: personal/samba/class_sambaAccount.inc:259
 msgid "Idle timeout before disconnecting from terminal server"
-msgstr "Doba neÄinnosti, po jejÃmÅ¾ uplynutÃ dojde k samoÄinnÃ©mu odpojenÃ od terminÃ¡lovÃ©ho serveru"
+msgstr ""
+"Doba neÄinnosti, po jejÃmÅ¾ uplynutÃ dojde k samoÄinnÃ©mu odpojenÃ od "
+"terminÃ¡lovÃ©ho serveru"
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Connect client drives at logon"
@@ -158,7 +164,7 @@ msgstr "Jednotka, kterou pÅ™ipojit po pÅ™ihlÃ¡Å¡enÃ"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Connect client printers at logon"
-msgstr "PÅ™i pÅ™ihlÃ¡Å¡enÃ pÅ™ipojit klientovy sÃÅ¥ovÃ© tiskÃ¡rny"
+msgstr "pÅ™i pÅ™ihlÃ¡Å¡enÃ pÅ™ipojit klientovy sÃÅ¥ovÃ© tiskÃ¡rny"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Printers to connect after login"
@@ -166,7 +172,7 @@ msgstr "TiskÃ¡rny, kterÃ© pÅ™ipojit po pÅ™ihlÃ¡Å¡enÃ"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default to main client printer"
-msgstr "HlavnÃ tiskÃ¡rnu klienta nastavit jako vÃ½chozÃ"
+msgstr "nastavit hlavnÃ tiskÃ¡rnu klienta jako vÃ½chozÃ"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default printer for this client"
@@ -174,15 +180,15 @@ msgstr "VÃ½chozÃ tiskÃ¡rna pro tohoto klienta"
 
 #: personal/samba/class_sambaAccount.inc:276
 msgid "Shadowing"
-msgstr "SkrÃ½vÃ¡nÃ"
+msgstr "skrÃ½vÃ¡nÃ"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "disabled"
-msgstr "vypnuto"
+msgstr "zakÃ¡zÃ¡no"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "input on, notify on"
-msgstr "zapnout vstup a oznamovÃ¡nÃ"
+msgstr "vstup a oznamovÃ¡nÃ zapnuty"
 
 #: personal/samba/class_sambaAccount.inc:279
 msgid "input on, notify off"
@@ -214,23 +220,23 @@ msgstr "resetovat"
 
 #: personal/samba/class_sambaAccount.inc:289
 msgid "Reconnect if disconnected"
-msgstr "V pÅ™ÃpadÄ› odpojenÃ pÅ™ipojit znovu"
+msgstr "v pÅ™ÃpadÄ› odpojenÃ pÅ™ipojit znovu"
 
 #: personal/samba/class_sambaAccount.inc:292
 msgid "from any client"
-msgstr "z jakÃ©hokoli klienta"
+msgstr "z jakÃ©hokoli poÄÃtaÄe"
 
 #: personal/samba/class_sambaAccount.inc:292
 msgid "from previous client only"
-msgstr "Pouze z minule pouÅ¾itÃ©ho klienta"
+msgstr "pouze z naposledy pouÅ¾itÃ©ho poÄÃtaÄe"
 
 #: personal/samba/class_sambaAccount.inc:304
 msgid "Access options"
-msgstr "MoÅ¾nosti pÅ™Ãstupu"
+msgstr "moÅ¾nosti pÅ™Ãstupu"
 
 #: personal/samba/class_sambaAccount.inc:308
 msgid "Enforce password change"
-msgstr "PÅ™imÄ›t ke zmÄ›nÄ› hesla"
+msgstr "vynutit zmÄ›nu hesla"
 
 #: personal/samba/class_sambaAccount.inc:308
 msgid "Force the user to change his password"
@@ -242,11 +248,11 @@ msgstr "Heslo je platnÃ© stÃ¡le"
 
 #: personal/samba/class_sambaAccount.inc:313
 msgid "The password will never expire"
-msgstr "Platnost hesla nikdy neskonÄÃ"
+msgstr "Platnost hesla nikdy nevyprÅ¡Ã"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from windows client requires no password"
-msgstr "PÅ™ihlÃ¡Å¡enÃ z klienta s MS Windows nevyÅ¾aduje heslo"
+msgstr "pÅ™ihlÃ¡Å¡enÃ z klienta s MS Windows nevyÅ¾aduje heslo"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from a client without a password"
@@ -262,15 +268,15 @@ msgstr "Uzamknout ÃºÄet"
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Cannot change password"
-msgstr "Heslo nelze zmÄ›nit"
+msgstr "heslo nepÅ¯jde zmÄ›nit"
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Not allowed to change password"
-msgstr "ZmÄ›na hesla nenÃ umoÅ¾nÄ›na"
+msgstr "ZmÄ›na hesla nenÃ dovolena"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "Account expiration"
-msgstr "SkonÄenÃ platnosti ÃºÄtu"
+msgstr "VyprÅ¡enÃ platnosti ÃºÄtu"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "When does the account expire"
@@ -286,7 +292,7 @@ msgstr "Ve kterÃ½ch Äasech je dovoleno se pÅ™ipojit"
 
 #: personal/samba/class_sambaAccount.inc:341
 msgid "Edit settings"
-msgstr "Upravit nastavenÃ"
+msgstr "upravit nastavenÃ"
 
 #: personal/samba/class_sambaAccount.inc:357
 msgid "System trust"
@@ -294,109 +300,117 @@ msgstr "systÃ©m dÅ¯vÄ›ryhodnosti"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Allow connection from these workstations only"
-msgstr "Povolit pÅ™ipojenÃ pouze z tÄ›chto poÄÃtaÄÅ¯"
+msgstr "povolit pÅ™ipojenÃ pouze z tÄ›chto pracovnÃch stanic"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Tomuto uÅ¾ivateli povolit pÅ™ipojenÃ pouze na poÄÃtaÄe z tohoto seznamu"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "domovskÃ© ÃºloÅ¾iÅ¡tÄ›"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "cesta k domovskÃ©mu ÃºloÅ¾iÅ¡ti"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
-msgstr "SprÃ¡vce uÅ¾ivatelskÃ½ch ÃºÄtÅ¯ v MS Windows umoÅ¾Åˆuje nejvÃ½Å¡e 8 klientÅ¯!"
+msgstr "SprÃ¡vce uÅ¾ivatelskÃ½ch ÃºÄtÅ¯ v MS Windows povoluje maximÃ¡lnÄ› 8 klientÅ¯!"
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
-msgstr "VarovÃ¡nÃ"
+msgstr "varovÃ¡nÃ"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "ZjiÅ¡tÄ›no nedefinovanÃ© Samba SID. Opravte tento problÃ©m ruÄnÃm zÃ¡sahem!"
+msgstr ""
+"ZjiÅ¡tÄ›no nedefinovanÃ© SID Samby. ProsÃm opravte tento problÃ©m ruÄnÃm zÃ¡sahem"
+" do nastavenÃ!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Nemohu pÅ™evÃ©st primÃ¡rnÃ skupinu na skupinu Samby: skupinu se nepodaÅ™ilo identifikovat!"
+msgstr ""
+"Nemohu pÅ™evÃ©st primÃ¡rnÃ skupinu na skupinu Samby: skupinu se nepodaÅ™ilo "
+"identifikovat!"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
-msgstr "NedaÅ™Ã se pÅ™evÃ©st hlavnÃ skupinu na samba skupinu: panel samba skupiny je vypnutÃ½!"
+msgstr ""
+"NedaÅ™Ã se pÅ™evÃ©st hlavnÃ skupinu na samba skupinu: panel samba skupiny je "
+"vypnutÃ½!"
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
 msgstr "NastavenÃ zÃ¡suvnÃ©ho modulu Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr "RDN ÃºÄtu stroje pro Samba"
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "UmÃstÄ›nÃ, ve kterÃ©m bude FusionDirectory hledat novÃ© pracovnÃ stanice se Samba."
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "PÅ™evod identifikÃ¡torÅ¯ Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "UchovÃ¡vat objekty sambaIdmapEntry. V zÃ¡vislosti na vaÅ¡em nastavenÃ to mÅ¯Å¾e vÃ½raznÄ› zrychlit pÅ™ihlaÅ¡ovÃ¡nÃ do Windows."
+msgstr ""
+"UchovÃ¡vat objekty sambaIdmapEntry. V zÃ¡vislosti na vaÅ¡em nastavenÃ to mÅ¯Å¾e "
+"vÃ½raznÄ› zrychlit pÅ™ihlaÅ¡ovÃ¡nÃ do Windows."
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "SID Samby"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "BezpeÄnosnÃ identifikÃ¡tor Samba nenÃ k dispozici v LDAP prostÅ™ednictvÃm samba schÃ©matu. AktuÃ¡lnÃ bezpeÄnostnÃ identifikÃ¡tor mÅ¯Å¾ete zÃskat pÅ™Ãkazem net getlocalsid."
+msgstr ""
+"BezpeÄnosnÃ identifikÃ¡tor Samba nenÃ k dispozici v LDAP prostÅ™ednictvÃm "
+"samba schÃ©matu. AktuÃ¡lnÃ bezpeÄnostnÃ identifikÃ¡tor mÅ¯Å¾ete zÃskat pÅ™Ãkazem "
+"net getlocalsid."
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr "PoÄÃ¡tek Samba rid"
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr "ZÃ¡kladnÃ identifikÃ¡tor, kterÃ½ pÅ™idat k bÄ›Å¾nÃ½m vÃ½poÄtÅ¯m bezpeÄnostnÃch identifikÃ¡torÅ¯m â€“ pokud nenÃ k dispozici v LDAP prostÅ™ednictvÃm schÃ©matu Samba."
+msgstr ""
+"ZÃ¡kladnÃ identifikÃ¡tor, kterÃ½ pÅ™idat k bÄ›Å¾nÃ½m vÃ½poÄtÅ¯m bezpeÄnostnÃch "
+"identifikÃ¡torÅ¯m â€“ pokud nenÃ k dispozici v LDAP prostÅ™ednictvÃm schÃ©matu "
+"Samba."
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr "Synchronizace data vyprÅ¡enÃ platnosti"
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr "Sjednotit dobu platnosti s tÃm v POSIX?"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "VytvoÅ™it sambaLMPassword"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
-msgstr "Je tÅ™eba pro zpÄ›tnou sluÄitelnost se systÃ©my Windows starÅ¡Ãmi neÅ¾ Windows 98 a Samba servery starÅ¡Ãmi neÅ¾ verze 3.2"
+msgstr ""
+"Je tÅ™eba pro zpÄ›tnou sluÄitelnost se systÃ©my Windows starÅ¡Ãmi neÅ¾ Windows 98"
+" a Samba servery starÅ¡Ãmi neÅ¾ verze 3.2"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -420,46 +434,46 @@ msgstr "Typ skupiny"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Samba group type"
-msgstr "Typ Samba skupiny"
+msgstr "typ skupiny Samby"
 
 #: admin/groups/samba/class_sambaGroup.inc:60
 #: admin/groups/samba/class_sambaGroup.inc:120
 msgid "Samba group"
-msgstr "Samba skupina"
+msgstr "skupina v SambÄ›"
 
 #: admin/groups/samba/class_sambaGroup.inc:60
 #: admin/groups/samba/class_sambaGroup.inc:120
 msgid "Domain admins"
-msgstr "SprÃ¡vci domÃ©ny"
+msgstr "sprÃ¡vci domÃ©ny"
 
 #: admin/groups/samba/class_sambaGroup.inc:60
 #: admin/groups/samba/class_sambaGroup.inc:120
 msgid "Domain users"
-msgstr "DomÃ©novÃ uÅ¾ivatelÃ©"
+msgstr "domÃ©novÃ uÅ¾ivatelÃ©"
 
 #: admin/groups/samba/class_sambaGroup.inc:60
 #: admin/groups/samba/class_sambaGroup.inc:120
 msgid "Domain guests"
-msgstr "DomÃ©novÃ hostÃ©"
+msgstr "domÃ©novÃ hostÃ©"
 
 #: admin/groups/samba/class_sambaGroup.inc:106
 msgid "Configuration error"
-msgstr "Chyba v nastavenÃ"
+msgstr "chyba v nastavenÃ"
 
 #: admin/groups/samba/class_sambaGroup.inc:106
 msgid "Cannot find group SID in your configuration!"
-msgstr "Ve stÃ¡vajÃcÃm nastavenÃ se nedaÅ™Ã nalÃ©zt SID skupiny!"
+msgstr "Ve vaÅ¡Ã konfiguraci nelze nalÃ©zt SID skupiny!"
 
 #: admin/groups/samba/class_sambaGroup.inc:120
 #, php-format
 msgid "Special group (%d)"
-msgstr "ZvlÃ¡Å¡tnÃ skupina (%d)"
+msgstr "speciÃ¡lnÃ skupina (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "DomÃ©ny Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "SprÃ¡va Samba domÃ©ny"
 
@@ -473,13 +487,13 @@ msgid "Samba domain settings"
 msgstr "NastavenÃ Samba domÃ©ny"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
-msgstr "Vlastnosti"
+msgstr "vlastnosti"
 
 #: admin/samba/class_sambaDomain.inc:54
 msgid "Domain name"
-msgstr "NÃ¡zev domÃ©ny"
+msgstr "nÃ¡zev domÃ©ny"
 
 #: admin/samba/class_sambaDomain.inc:54
 msgid "Name of this domain"
@@ -509,7 +523,9 @@ msgstr "minimÃ¡lnÃ stÃ¡Å™Ã hesla"
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ© stÃ¡Å™Ã hesla v sekundÃ¡ch (vÃ½chozÃ: 0 => umoÅ¾nit okamÅ¾itou zmÄ›nu hesla)"
+msgstr ""
+"NejkratÅ¡Ã umoÅ¾nÄ›nÃ© stÃ¡Å™Ã hesla v sekundÃ¡ch (vÃ½chozÃ: 0 => umoÅ¾nit okamÅ¾itou "
+"zmÄ›nu hesla)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
@@ -518,7 +534,9 @@ msgstr "maximÃ¡lnÃ stÃ¡Å™Ã hesla"
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "NejdelÅ¡Ã pÅ™ijatelnÃ© stÃ¡Å™Ã hesla, v sekundÃ¡ch (vÃ½chozÃ: -1 => hesla platÃ stÃ¡le)"
+msgstr ""
+"NejdelÅ¡Ã pÅ™ijatelnÃ© stÃ¡Å™Ã hesla, v sekundÃ¡ch (vÃ½chozÃ: -1 => hesla platÃ "
+"stÃ¡le)"
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
@@ -546,11 +564,11 @@ msgstr "PÅ™ÃÅ¡tÃ NT relativnÃ identifikÃ¡tor pro vaÅ¡e uÅ¾ivatele"
 
 #: admin/samba/class_sambaDomain.inc:93
 msgid "Minimum password length"
-msgstr "NejkratÅ¡Ã umoÅ¾nÄ›nÃ¡ dÃ©lka hesla"
+msgstr "MinimÃ¡lnÃ dÃ©lka hesla"
 
 #: admin/samba/class_sambaDomain.inc:94
 msgid "Minimal password length (default: 5)"
-msgstr "NejkratÅ¡Ã pÅ™ijatelnÃ¡ dÃ©lka hesla (vÃ½chozÃ: 5 znakÅ¯)"
+msgstr "MinimÃ¡lnÃ dÃ©lka hesla (vÃ½chozÃ: 5 znakÅ¯)"
 
 #: admin/samba/class_sambaDomain.inc:98
 msgid "Password history length"
@@ -566,15 +584,18 @@ msgstr "PÅ™ihlÃ¡sit se pro zmÄ›nu hesla"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "PÅ™imÄ›t uÅ¾ivatele pÅ™ihlÃ¡sit se pro zmÄ›nu hesla (vÃ½chozÃ: 0 => ne, 2 => ano)"
+msgstr ""
+"PÅ™imÄ›t uÅ¾ivatele pÅ™ihlÃ¡sit se pro zmÄ›nu hesla (vÃ½chozÃ: 0 => ne, 2 => ano)"
 
 #: admin/samba/class_sambaDomain.inc:108
 msgid "Lockout duration"
-msgstr "Doba trvÃ¡nÃ uzamÄenÃ"
+msgstr "doba trvÃ¡nÃ odemÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:109
 msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "DÃ©lka trvÃ¡nÃ uzamÄenÃ v minutÃ¡ch (vÃ½chozÃ: 30, hodnota -1 znamenÃ¡ uzamÄeno napoÅ™Ã¡d)"
+msgstr ""
+"DÃ©lka trvÃ¡nÃ uzamÄenÃ v minutÃ¡ch (vÃ½chozÃ: 30, hodnota -1 znamenÃ¡ uzamÄeno "
+"napoÅ™Ã¡d)"
 
 #: admin/samba/class_sambaDomain.inc:113
 msgid "Lockout observation window"
@@ -582,7 +603,9 @@ msgstr "PozorovacÃ okno uzamÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:114
 msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Za jak dlouho (v minutÃ¡ch) po uzamÄenÃ zaÄÃt poÄÃtat Äas od znovu (vÃ½chozÃ: 30)"
+msgstr ""
+"Za jak dlouho (v minutÃ¡ch) po uzamÄenÃ zaÄÃt poÄÃtat Äas od znovu (vÃ½chozÃ: "
+"30)"
 
 #: admin/samba/class_sambaDomain.inc:118
 msgid "Lockout threshold"
@@ -590,7 +613,9 @@ msgstr "PrÃ¡h uzamÄenÃ"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Uzamknout uÅ¾ivatele po nezdaÅ™enÃ½ch pokusech o pÅ™ihlÃ¡Å¡enÃ (vÃ½chozÃ: 0 => vypnuto)"
+msgstr ""
+"Uzamknout uÅ¾ivatele po nezdaÅ™enÃ½ch pokusech o pÅ™ihlÃ¡Å¡enÃ (vÃ½chozÃ: 0 => "
+"vypnuto)"
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
@@ -598,65 +623,30 @@ msgstr "Vynutit odhlÃ¡Å¡enÃ"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Pokud je mimo provoznÃ dobu, samoÄinnÄ› odpojovat uÅ¾ivatele (vÃ½chozÃ: -1 => neodpojovat, 0 => odpojovat)"
+msgstr ""
+"Pokud je mimo provoznÃ dobu, samoÄinnÄ› odpojovat uÅ¾ivatele (vÃ½chozÃ: -1 => "
+"neodpojovat, 0 => odpojovat)"
 
 #: admin/samba/class_sambaDomain.inc:128
 msgid "Refuse machine password change"
-msgstr "OdmÃtnout zmÄ›nu hesla k ÃºÄtu stroje"
+msgstr "odmÃtnout zmÄ›nu hesla stroje"
 
 #: admin/samba/class_sambaDomain.inc:129
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr "UmoÅ¾nit zmÄ›nu hesel poÄÃtaÄÅ¯ (vÃ½chozÃ: 0 => neumoÅ¾nit)"
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "PoÄÃtaÄ s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Informace o poÄÃtaÄi s MS Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "PoÄÃtaÄ s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "NÃ¡zev poÄÃtaÄe s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "NÃ¡zev"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "popis"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "StruÄnÃ½ popis poÄÃtaÄe s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "UmÃstÄ›nÃ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "UmÃstÄ›nÃ poÄÃtaÄe s MS Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "NastavenÃ sÃtÄ›"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
-msgstr "Zadejte ÄasovÃ© rozmezÃ, po kterÃ© se tento uÅ¾ivatel bude moci pÅ™ihlaÅ¡ovat."
+msgstr ""
+"Zadejte ÄasovÃ© rozmezÃ, po kterÃ© se tento uÅ¾ivatel bude moci pÅ™ihlaÅ¡ovat."
 
 #: personal/samba/sambaLogonHours.tpl.c:5
 msgid "Hour"
diff --git a/samba/locale/de/fusiondirectory.po b/samba/locale/de/fusiondirectory.po
index 8b0685b891fbb5cbaae8db3f54fbed45b566e144..da26b8f4f20b863e3988cb54a66f1c282935ce8b 100644
--- a/samba/locale/de/fusiondirectory.po
+++ b/samba/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:42+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Ihre PHP-Installation hat nicht den mhash() bzw. die hash-Funktion. MD4-Hashes kÃ¶nnen nicht durchgefÃ¼hrt werden."
+msgstr ""
+"Ihre PHP-Installation hat nicht den mhash() bzw. die hash-Funktion. "
+"MD4-Hashes kÃ¶nnen nicht durchgefÃ¼hrt werden."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -30,6 +33,7 @@ msgstr "Samba Munged Dial"
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +69,12 @@ msgstr "UNC-Pfad fÃ¼r das Homelaufwerk"
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "DomÃ¤ne"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Samba DomÃ¤nen-Name"
 
@@ -300,36 +304,40 @@ msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Nur diesem Benutzer erlauben, dieser Liste von Hosts zu verbinden"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Basis-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Der Windows Benutzermanager erlaubt maximal acht Clients!"
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem manuell!"
+msgstr ""
+"Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem "
+"manuell!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Kann primÃ¤re Gruppe nicht in Samba-Gruppe Ã¼berfÃ¼hren: die Gruppe kann nicht identifiziert werden!"
+msgstr ""
+"Kann primÃ¤re Gruppe nicht in Samba-Gruppe Ã¼berfÃ¼hren: die Gruppe kann nicht "
+"identifiziert werden!"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +347,62 @@ msgid "Samba plugin configuration"
 msgstr "Samba-Plugin-Konfiguration"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr "Samba Maschinenkonto RDN"
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "Der Ort wo FusionDirectory nach neuen Samba-Workstations sucht"
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "Samba ID Mapping"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "Warten von sambaldmapEntry Objekten. AbhÃ¤ngig von Ihrer Einstellung kann dies drastisch die Windowslogin-Leistung verbessern."
+msgstr ""
+"Warten von sambaldmapEntry Objekten. AbhÃ¤ngig von Ihrer Einstellung kann "
+"dies drastisch die Windowslogin-Leistung verbessern."
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "Eine Samba SID wenn nicht verfÃ¼gbar innerhalb des LDAP durch samba schema. Sie kÃ¶nnen die aktuelle sid Ã¼ber getlocalsid einholen."
+msgstr ""
+"Eine Samba SID wenn nicht verfÃ¼gbar innerhalb des LDAP durch samba schema. "
+"Sie kÃ¶nnen die aktuelle sid Ã¼ber getlocalsid einholen."
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr "Samba rid base"
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr "Die basis ID die normalen sid-Kalkulationen hinzugefÃ¼gt werden soll -  falls nicht verfÃ¼gbar innerhalb von des LDAP durch samba schemas."
+msgstr ""
+"Die basis ID die normalen sid-Kalkulationen hinzugefÃ¼gt werden soll -  falls"
+" nicht verfÃ¼gbar innerhalb von des LDAP durch samba schemas."
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr "Synchronisation von Verfallsdatum"
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr "Synchronisation des Verfallsdatum mit dem POSIX-betreffenden?"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "sambaLMPasswort generieren"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "BenÃ¶tigt um KompatibilitÃ¤t mit Windows <=98 oder Samba < 3.2 zu haben"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +461,11 @@ msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "Samba-DomÃ¤nen"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "Samba-DomÃ¤nenverwaltung"
 
@@ -473,7 +479,7 @@ msgid "Samba domain settings"
 msgstr "Samba-DomÃ¤neneinstellungen"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Eigenschaften"
 
@@ -503,22 +509,26 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:66
 msgid "Minimum password age"
-msgstr "Minimales Passwortalter"
+msgstr "Minimales Passwort-Alter"
 
 #: admin/samba/class_sambaDomain.inc:67
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr "Minimales Passwortalter in Sekunden (Standard: 0 => sofortige PasswortÃ¤nderung erlauben)"
+msgstr ""
+"Minimales Passwortalter in Sekunden (Standard: 0 => sofortige "
+"PasswortÃ¤nderung erlauben)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
-msgstr "Maximales Passwortalter"
+msgstr "Maximales Passwort-Alter"
 
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "Maximales Passwortalter in Sekunden (Standard: -1 => nie ablaufende PasswÃ¶rter)"
+msgstr ""
+"Maximales Passwortalter in Sekunden (Standard: -1 => nie ablaufende "
+"PasswÃ¶rter)"
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
@@ -608,48 +618,10 @@ msgstr "Verweigere Ã„nderung der PasswÃ¶rter fÃ¼r Computerkonten"
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr "RechnerpasswortÃ¤nderungen erlauben (Standard: 0 => aus)"
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Windows-Arbeitsstationinformation"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows Arbeitsstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Der Name der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Name"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beschreibung"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Eine kurze Beschreibung der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Ort"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Der Ort der winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Netzwerkeinstellungen"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr "Samba-Freigaben aktualisieren"
diff --git a/samba/locale/el_GR/fusiondirectory.po b/samba/locale/el_GR/fusiondirectory.po
index 8c3f476d5a0993bbb399685de1e98972a3814a70..f8dcf40c22ba089654cdca42afd37488d82355f1 100644
--- a/samba/locale/el_GR/fusiondirectory.po
+++ b/samba/locale/el_GR/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Elissavet Botsaki <elisavet_b@hotmail.com>, 2015
-# geotheod <geotheod77@gmail.com>, 2015
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,6 +31,7 @@ msgstr "Î”Î¹ÎºÎ±Î¹ÏŽÎ¼Î±Ï„Î± ÎºÎ»Î®ÏƒÎ·Ï‚ Samba"
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Î›Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ Samba"
 
@@ -68,12 +67,12 @@ msgstr "Î”Î¹Î±Î´ÏÎ¿Î¼Î® UNC Î³Î¹Î± Ï„Î¿Î½ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒ Î¿Î´Î·Î³ÏŒ"
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Î¤Î¿Î¼ÎÎ±Ï‚"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "ÎŒÎ½Î¿Î¼Î± Ï„Î¿Î¼ÎÎ± Ï„Î¿Ï… Samba"
 
@@ -97,7 +96,7 @@ msgstr "Î”Î¹Î±Î´ÏÎ¿Î¼Î® Ï„Î¿Ï… Ï€ÏÎ¿Ï†Î¯Î» UNC"
 
 #: personal/samba/class_sambaAccount.inc:214
 msgid "Terminal server"
-msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŽÎ½"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Allow login on terminal server"
@@ -301,105 +300,110 @@ msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î· ÏƒÏÎ½Î´ÎµÏƒÎ· Î¼ÏŒÎ½Î¿ Î±Ï€ÏŒ Î±Ï…Ï„Î¿Ï
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Only allow this user to connect to this list of hosts"
-msgstr "Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
+msgstr ""
+"Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒÏ‚ Î¿Î´Î·Î³ÏŒÏ‚"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "ÎœÎ¿Î½Î¿Ï€Î¬Ï„Î¹ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï…"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "ÎŸ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Ï„Ï‰Î½ Windows ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î±ÏÎ¹Î¸Î¼ÏŒ 8 Ï€ÎµÎ»Î±Ï„ÏŽÎ½"
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Î‘Î½Î¹Ï‡Î½ÎµÏÎ¸Î·ÎºÎµ Î±Ï€ÏÎ¿ÏƒÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿ Samba SID. Î Î±ÏÎ±ÎºÎ±Î»ÎµÎ¯ÏƒÏ„Îµ Î½Î± Î´Î¹Î¿ÏÎ¸ÏŽÏƒÎµÏ„Îµ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± Ï„Î¿ Ï€ÏÏŒÎ²Î»Î·Î¼Î±."
+msgstr ""
+"Î‘Î½Î¹Ï‡Î½ÎµÏÎ¸Î·ÎºÎµ Î±Ï€ÏÎ¿ÏƒÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿ Samba SID. Î Î±ÏÎ±ÎºÎ±Î»ÎµÎ¯ÏƒÏ„Îµ Î½Î± Î´Î¹Î¿ÏÎ¸ÏŽÏƒÎµÏ„Îµ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± "
+"Ï„Î¿ Ï€ÏÏŒÎ²Î»Î·Î¼Î±."
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® Ï„Î·Ï‚ ÎºÏÏÎ¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ ÏƒÎµ Î¿Î¼Î¬Î´Î± Samba: Î· Î¿Î¼Î¬Î´Î± Î´ÎµÎ½ Ï„Î±Ï…Ï„Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹"
+msgstr ""
+"Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® Ï„Î·Ï‚ ÎºÏÏÎ¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ ÏƒÎµ Î¿Î¼Î¬Î´Î± Samba: Î· Î¿Î¼Î¬Î´Î± Î´ÎµÎ½ "
+"Ï„Î±Ï…Ï„Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
-msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® Ï„Î·Ï‚ ÎºÏÏÎ¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ ÏƒÎµ Î¿Î¼Î¬Î´Î± Samba: ÎµÎ¯Î½Î±Î¹ Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿ Ï„Î¿ Ï€ÎµÎ´Î¯Î¿ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚ Ï„Î·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ Samba"
+msgstr ""
+"Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î¼ÎµÏ„Î±Ï„ÏÎ¿Ï€Î® Ï„Î·Ï‚ ÎºÏÏÎ¹Î±Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ ÏƒÎµ Î¿Î¼Î¬Î´Î± Samba: ÎµÎ¯Î½Î±Î¹ "
+"Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿ Ï„Î¿ Ï€ÎµÎ´Î¯Î¿ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚ Ï„Î·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
 msgstr "Î¡ÏÎ¸Î¼Î¹ÏƒÎ· Ï€ÏÎ¿ÏƒÎ¸ÎÏ„Ï‰Î½ Ï„Î¿Ï… Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÏ„Î±Î¸Î¼Î¿Ï Samba RDN"
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "Î— Î¸ÎÏƒÎ· ÏƒÏ„Î·Î½ Î¿Ï€Î¿Î¯Î± Ï„Î¿ FusionDirectory Î±Î½Î±Î¶Î·Ï„Î¬ Î½ÎÎ¿Ï…Ï‚ ÏƒÏ„Î±Î¸Î¼Î¿ÏÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Samba"
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "Î‘Î½Ï„Î¹ÏƒÏ„Î¿Î¯Ï‡Î¹ÏƒÎ· Samba ID"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½ sambaIdmapEntry. Î‘Î½Î¬Î»Î¿Î³Î± Î¼Îµ Ï„Î· ÏÏÎ¸Î¼Î¹ÏƒÎ·, Î±Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î²ÎµÎ»Ï„Î¹ÏŽÏƒÎµÎ¹ Î´ÏÎ±ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¹Ï‚ ÎµÏ€Î¹Î´ÏŒÏƒÎµÎ¹Ï‚ ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ¯ÏƒÎ¿Î´Î¿ ÏƒÎµ Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½ Windows"
+msgstr ""
+"Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½ sambaIdmapEntry. Î‘Î½Î¬Î»Î¿Î³Î± Î¼Îµ Ï„Î· ÏÏÎ¸Î¼Î¹ÏƒÎ·, Î±Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ "
+"Î½Î± Î²ÎµÎ»Ï„Î¹ÏŽÏƒÎµÎ¹ Î´ÏÎ±ÏƒÏ„Î¹ÎºÎ¬ Ï„Î¹Ï‚ ÎµÏ€Î¹Î´ÏŒÏƒÎµÎ¹Ï‚ ÎºÎ±Ï„Î¬ Ï„Î·Î½ ÎµÎ¯ÏƒÎ¿Î´Î¿ ÏƒÎµ Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½ Windows"
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "ÎˆÎ½Î± Samba ID, Î±Î½ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ ÏƒÏ„Î¿Î½ LDAP Î¼ÎÏƒÏ‰ Ï„Î¿Ï… ÏƒÏ‡Î®Î¼Î±Ï„Î¿Ï‚ Ï„Î¿Ï… Samba. ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Î±Î½Î±ÎºÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ Ï„ÏÎÏ‡Î¿Î½ SID ÎµÎºÏ„ÎµÎ»ÏŽÎ½Ï„Î±Ï‚ net getlocalsid."
+msgstr ""
+"ÎˆÎ½Î± Samba ID, Î±Î½ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿ ÏƒÏ„Î¿Î½ LDAP Î¼ÎÏƒÏ‰ Ï„Î¿Ï… ÏƒÏ‡Î®Î¼Î±Ï„Î¿Ï‚ Ï„Î¿Ï… Samba. "
+"ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Î±Î½Î±ÎºÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ Ï„ÏÎÏ‡Î¿Î½ SID ÎµÎºÏ„ÎµÎ»ÏŽÎ½Ï„Î±Ï‚ net getlocalsid."
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr "Î’Î¬ÏƒÎ· Samba Rid"
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr "ÎŸ ÏƒÏ…Î½Ï„ÎµÎ»ÎµÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ ID Ï€Î¿Ï… Ï€ÏÎ¿ÏƒÏ„Î¯Î¸ÎµÏ„Î±Î¹ ÏƒÎµ Î±Ï€Î»Î¿ÏÏ‚ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÎ¼Î¿ÏÏ‚ SID - Î±Î½ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ ÏƒÏ„Î¿Î½ LDAP Î¼ÎÏƒÏ‰ Ï„Î¿Ï… ÏƒÏ‡Î®Î¼Î±Ï„Î¿Ï‚ Samba."
+msgstr ""
+"ÎŸ ÏƒÏ…Î½Ï„ÎµÎ»ÎµÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ ID Ï€Î¿Ï… Ï€ÏÎ¿ÏƒÏ„Î¯Î¸ÎµÏ„Î±Î¹ ÏƒÎµ Î±Ï€Î»Î¿ÏÏ‚ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÎ¼Î¿ÏÏ‚ SID - Î±Î½ Î´ÎµÎ½ "
+"ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ ÏƒÏ„Î¿Î½ LDAP Î¼ÎÏƒÏ‰ Ï„Î¿Ï… ÏƒÏ‡Î®Î¼Î±Ï„Î¿Ï‚ Samba."
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚ Ï„Î¿Ï… ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÎ¼Î¿Ï"
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr "ÎÎ± ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÏ„ÎµÎ¯ Î· Î·Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚ Î¼Îµ Î±Ï…Ï„Î®Î½ Ï„Î¿Ï… POSIX?"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± sambaLMPassword"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "Î ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ…Î¼Î²Î±Ï„ÏŒ Î¼Îµ Windows <= 98 Î® Î¼Îµ Samba <3.2"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -458,11 +462,11 @@ msgstr "Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î²ÏÎµÎ¸ÎµÎ¯ Ï„Î¿ SID Ï„Î·Ï‚ Î¿Î¼Î¬Î´Î±Ï‚ ÏƒÏ„
 msgid "Special group (%d)"
 msgstr "Î•Î¹Î´Î¹ÎºÎ® Î¿Î¼Î¬Î´Î± (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "Î¤Î¿Î¼ÎµÎ¯Ï‚ Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î¤Î¿Î¼ÎÎ± Samba"
 
@@ -476,7 +480,7 @@ msgid "Samba domain settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Ï„Î¿Î¼ÎÎ± Samba"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚"
 
@@ -512,7 +516,9 @@ msgstr "Î•Î»Î¬Ï‡Î¹ÏƒÏ„Î· Î·Î»Î¹ÎºÎ¯Î± ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr "Î•Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏÏ€Î±ÏÎ¾Î·Ï‚ Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï, ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚: 0 => ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î·Î½ Î¬Î¼ÎµÏƒÎ· Î±Î»Î»Î±Î³Î® Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï)"
+msgstr ""
+"Î•Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏÏ€Î±ÏÎ¾Î·Ï‚ Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï, ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚: 0 =>"
+" ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î·Î½ Î¬Î¼ÎµÏƒÎ· Î±Î»Î»Î±Î³Î® Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
@@ -521,7 +527,9 @@ msgstr "ÎœÎÎ³Î¹ÏƒÏ„Î· Î·Î»Î¹ÎºÎ¯Î± ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏÏ€Î±ÏÎ¾Î·Ï‚ Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï, ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚: -1 => ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Ï€Î¿Ï… Î´ÎµÎ½ Î»Î®Î³Î¿Ï…Î½ Ï€Î¿Ï„Î)"
+msgstr ""
+"ÎœÎÎ³Î¹ÏƒÏ„Î¿Ï‚ Ï‡ÏÏŒÎ½Î¿Ï‚ ÏÏ€Î±ÏÎ¾Î·Ï‚ Ï„Î¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï, ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚: -1 =>"
+" ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ Ï€Î¿Ï… Î´ÎµÎ½ Î»Î®Î³Î¿Ï…Î½ Ï€Î¿Ï„Î)"
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
@@ -561,7 +569,9 @@ msgstr "Î Î»Î®Î¸Î¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ"
 
 #: admin/samba/class_sambaDomain.inc:99
 msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Î¤Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Ï„Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
+msgstr ""
+"Î¤Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ Ï„Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ ÏƒÏ„Î¿ Î¹ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => "
+"Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
@@ -569,7 +579,9 @@ msgstr "Î£Ï…Î½Î´ÎµÎ¸ÎµÎ¯Ï„Îµ Î³Î¹Î± Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ ÎºÏ‰Î´Î¹ÎºÏŒ"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Î¥Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ® ÏƒÏÎ½Î´ÎµÏƒÎ· Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î³Î¹Î± Î±Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿, 2 => ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
+msgstr ""
+"Î¥Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ® ÏƒÏÎ½Î´ÎµÏƒÎ· Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î³Î¹Î± Î±Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => "
+"Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿, 2 => ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
 
 #: admin/samba/class_sambaDomain.inc:108
 msgid "Lockout duration"
@@ -593,7 +605,9 @@ msgstr "ÎšÎ±Ï„ÏŽÏ†Î»Î¹ ÎºÎ»ÎµÎ¹Î´ÏŽÎ¼Î±Ï„Î¿Ï‚"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "ÎšÎ»ÎµÎ¯Î´Ï‰Î¼Î± Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ ÎµÏƒÏ†Î±Î»Î¼ÎÎ½ÎµÏ‚ Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹ÎµÏ‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
+msgstr ""
+"ÎšÎ»ÎµÎ¯Î´Ï‰Î¼Î± Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ ÎµÏƒÏ†Î±Î»Î¼ÎÎ½ÎµÏ‚ Ï€ÏÎ¿ÏƒÏ€Î¬Î¸ÎµÎ¹ÎµÏ‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0"
+" => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
@@ -601,7 +615,9 @@ msgstr "Î¥Ï€Î¿Ï‡ÏÎµÏ‰Ï„Î¹ÎºÎ® Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ· Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎµÎºÏ„ÏŒÏ‚ Ï„Ï‰Î½ Ï‰ÏÏŽÎ½ ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Î·Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: -1 => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿, 0 => ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
+msgstr ""
+"Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ· Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎµÎºÏ„ÏŒÏ‚ Ï„Ï‰Î½ Ï‰ÏÏŽÎ½ ÎµÏ€Î¹Ï„ÏÎµÏ€ÏŒÎ¼ÎµÎ½Î·Ï‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: -1"
+" => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿, 0 => ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
 
 #: admin/samba/class_sambaDomain.inc:128
 msgid "Refuse machine password change"
@@ -609,50 +625,14 @@ msgstr "Î†ÏÎ½Î·ÏƒÎ· Î±Î»Î»Î±Î³Î®Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î¼Î·Ï‡Î±Î½Î®Î¼Î±Ï„Î¿Ï‚"
 
 #: admin/samba/class_sambaDomain.inc:129
 msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Î•Ï€Î¯Ï„ÏÎµÏˆÎµ Ï„Î·Î½ Î±Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï„Î¿Ï… Î¼Î·Ï‡Î±Î½Î®Î¼Î±Ï„Î¿Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
+msgstr ""
+"Î•Ï€Î¯Ï„ÏÎµÏˆÎµ Ï„Î·Î½ Î±Î»Î»Î±Î³Î® ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï„Î¿Ï… Î¼Î·Ï‡Î±Î½Î®Î¼Î±Ï„Î¿Ï‚ (Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿: 0 => "
+"Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿)"
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ„Î±Î¸Î¼Î¿Ï ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Î£Ï„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… ÏƒÏ„Î±Î¸Î¼Î¿Ï ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "ÎŒÎ½Î¿Î¼Î±"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "ÎœÎ¯Î± ÏƒÏÎ½Ï„Î¿Î¼Î· Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… ÏƒÏ„Î±Î¸Î¼Î¿Ï ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Î— Ï„Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î± Ï„Î¿Ï… ÏƒÏ„Î±Î¸Î¼Î¿Ï ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Î¼Îµ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/en/fusiondirectory.po b/samba/locale/en/fusiondirectory.po
index c470f50c449e79918e682e8de8ec553aae13b90f..2d0994882e48d66103c686a7b007673e9439c40e 100644
--- a/samba/locale/en/fusiondirectory.po
+++ b/samba/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can "
 "retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of "
 "the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/es/fusiondirectory.po b/samba/locale/es/fusiondirectory.po
index 01450deaf97c96d2ef94728f397df0d9bbcef603..96b9bf4dc57c315af50265f3c6fc51a1bb0dba63 100644
--- a/samba/locale/es/fusiondirectory.po
+++ b/samba/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Dominio"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
@@ -300,36 +302,40 @@ msgstr "Permitir la conexiÃ³n solo desde estas estaciones de trabajo"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Unidad inicial"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Ruta inicial"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Se ha detectado un SID Samba sin definir. Â¡Por favor solucione este problema manualmente!"
+msgstr ""
+"Se ha detectado un SID Samba sin definir. Â¡Por favor solucione este problema"
+" manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede ser identificado!"
+msgstr ""
+"No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede "
+"ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +345,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +453,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:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +471,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -608,55 +606,18 @@ msgstr "No se permite modificar la contraseÃ±a de mÃ¡quina"
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Estaciones de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalizaciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
-msgstr "Introducir las horas en que este usuario tendrÃ¡ permiso de inicio de sesiÃ³n"
+msgstr ""
+"Introducir las horas en que este usuario tendrÃ¡ permiso de inicio de sesiÃ³n"
 
 #: personal/samba/sambaLogonHours.tpl.c:5
 msgid "Hour"
diff --git a/samba/locale/es_CO/fusiondirectory.po b/samba/locale/es_CO/fusiondirectory.po
index bc0ebe3158864ca260b05a060f1ab7895a103f37..43d9112235feecb9fd258e11328d64f1b90b6207 100644
--- a/samba/locale/es_CO/fusiondirectory.po
+++ b/samba/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Su instalaciÃ³n PHP no tiene mhash() u otra funciÃ³n hash. No es posible hacer hashes MD4."
+msgstr ""
+"Su instalaciÃ³n PHP no tiene mhash() u otra funciÃ³n hash. No es posible hacer"
+" hashes MD4."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -30,6 +33,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +69,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Dominio"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +304,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir a este usuario conectarse a esta lista de hosts."
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "PrecacuiÃ³n"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +343,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +451,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +469,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -608,48 +604,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "UbicaciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/es_VE/fusiondirectory.po b/samba/locale/es_VE/fusiondirectory.po
index 1220d69a2177bc58967cf03276caa16e7beba0fb..a96a05f4ce35c53027120094f9a65414f67afb35 100644
--- a/samba/locale/es_VE/fusiondirectory.po
+++ b/samba/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Dominio"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
@@ -300,36 +302,41 @@ msgstr "Permitir la conexiÃ³n solo desde estas estaciones de trabajo"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Unidad inicial"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Ruta inicial"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
-msgstr "El manejador de usuarios de Windows permite un mÃ¡ximo de ocho clientes!"
+msgstr ""
+"El manejador de usuarios de Windows permite un mÃ¡ximo de ocho clientes!"
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Se ha detectado un SID Samba sin definir. Â¡Por favor solucione este problema manualmente!"
+msgstr ""
+"Se ha detectado un SID Samba sin definir. Â¡Por favor solucione este problema"
+" manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede ser identificado!"
+msgstr ""
+"No se puede convertir un grupo primario a grupo samba: Â¡El grupo no puede "
+"ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +346,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +454,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:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +472,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -608,55 +607,18 @@ msgstr "No se permite modificar la contraseÃ±a de mÃ¡quina"
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Estaciones de trabajo Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nombre"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "DescripciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalizaciÃ³n"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
 
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
-msgstr "Introducir las horas en que este usuario tendrÃ¡ permiso de inicio de sesiÃ³n"
+msgstr ""
+"Introducir las horas en que este usuario tendrÃ¡ permiso de inicio de sesiÃ³n"
 
 #: personal/samba/sambaLogonHours.tpl.c:5
 msgid "Hour"
diff --git a/samba/locale/fa_IR/fusiondirectory.po b/samba/locale/fa_IR/fusiondirectory.po
index d126bc87844f74c33d630e42fe05bdf9fd9e7090..a5d17e816900ea9b2ac0218930df664f0ade707d 100644
--- a/samba/locale/fa_IR/fusiondirectory.po
+++ b/samba/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/fi_FI/fusiondirectory.po b/samba/locale/fi_FI/fusiondirectory.po
index 1fa1ede4260abbe37365014ca8e243a231bf291b..cefa7c5684f34afe870d50ced77ad11093c23da7 100644
--- a/samba/locale/fi_FI/fusiondirectory.po
+++ b/samba/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Varoitus"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Ominaisuudet"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nimi"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Kuvaus"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/fr/fusiondirectory.po b/samba/locale/fr/fusiondirectory.po
index c31466f6bcff8da86e558e13f128ebd13403552e..d4f7b530fbca2204e790e448c965d682b4d94dba 100644
--- a/samba/locale/fr/fusiondirectory.po
+++ b/samba/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Votre installation de PHP ne dispose pas de la fonction mhash() ni de la fonction hash.  L'encodage MD4 ne peut pas Ãªtre rÃ©alise"
+msgstr ""
+"Votre installation de PHP ne dispose pas de la fonction mhash() ni de la "
+"fonction hash.  L'encodage MD4 ne peut pas Ãªtre rÃ©alise"
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -32,6 +33,7 @@ msgstr "Samba Munged Dial"
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -47,34 +49,34 @@ msgstr "Profil Samba"
 #: personal/samba/class_sambaAccount.inc:189
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Home directory drive"
-msgstr "Disque du rÃ©pertoire personnel"
+msgstr "RÃ©pertoire Home"
 
 #: personal/samba/class_sambaAccount.inc:189
 #: personal/samba/class_sambaAccount.inc:222
 msgid "Letter for the home drive"
-msgstr "Lettre du disque contenant le rÃ©pertoire personnel"
+msgstr "Lecteur rÃ©seau par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:194
 #: personal/samba/class_sambaAccount.inc:227
 msgid "Home directory path"
-msgstr "Chemin du rÃ©pertoire personnel"
+msgstr "Chemin du rÃ©pertoire home"
 
 #: personal/samba/class_sambaAccount.inc:194
 #: personal/samba/class_sambaAccount.inc:227
 msgid "UNC path for the home drive"
-msgstr "Chemin UNC du rÃ©pertoire personnel de cet utilisateur"
+msgstr "Chemin UNC du  \"home\" de cet utilisateur"
 
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Domaine"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
-msgstr "Nom du domaine Samba"
+msgstr "Domaine Samba"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Script path"
@@ -82,12 +84,12 @@ msgstr "Chemin du Script"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Login script path"
-msgstr "Chemin du script de login"
+msgstr "Chemin du script par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
 msgid "Profile path"
-msgstr "Chemin du profile"
+msgstr "Chemin du Profile"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
@@ -100,15 +102,15 @@ msgstr "Serveur de terminaux"
 
 #: personal/samba/class_sambaAccount.inc:218
 msgid "Allow login on terminal server"
-msgstr "Permet la connexion sur le serveur de terminaux"
+msgstr "Permet la connexion sur un serveur de terminaux"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client config"
-msgstr "HÃ©riter de la configuration du client"
+msgstr "HÃ©rite de la configuration du client"
 
 #: personal/samba/class_sambaAccount.inc:237
 msgid "Inherit client configuration"
-msgstr "HÃ©riter de la configuration du client"
+msgstr "HÃ©rite de la configuration du client"
 
 #: personal/samba/class_sambaAccount.inc:241
 msgid "Initial progam"
@@ -124,19 +126,19 @@ msgstr "RÃ©pertoire de travail"
 
 #: personal/samba/class_sambaAccount.inc:245
 msgid "Basic working directory"
-msgstr "RÃ©pertoire de travail de base"
+msgstr "RÃ©pertoire de travail"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Connection timeout"
-msgstr "DÃ©lai dâ€™attente de connexion"
+msgstr "DÃ©lai de connexion"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Timeout when connecting to terminal server"
-msgstr "DÃ©lai dâ€™attente lors de la connexion au serveur de terminal"
+msgstr "Timeout lors de la connexion au serveur de terminal"
 
 #: personal/samba/class_sambaAccount.inc:254
 msgid "Disconnection timeout"
-msgstr "DÃ©lai avant dÃ©connexion"
+msgstr "DÃ©lai avant la deconnexion"
 
 #: personal/samba/class_sambaAccount.inc:254
 msgid "Timeout before disconnecting from terminal server"
@@ -144,7 +146,7 @@ msgstr "DÃ©lai avant dÃ©connexion du serveur de terminal"
 
 #: personal/samba/class_sambaAccount.inc:259
 msgid "Idle timeout"
-msgstr "DÃ©lai d'inactivitÃ©"
+msgstr "DÃ©lai d'inactivitÃ© sans traffic"
 
 #: personal/samba/class_sambaAccount.inc:259
 msgid "Idle timeout before disconnecting from terminal server"
@@ -152,7 +154,7 @@ msgstr "DÃ©lai d'inactivitÃ© avant la dÃ©connexion du serveur de terminal"
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Connect client drives at logon"
-msgstr "Connecter les lecteurs clients Ã  la connexion"
+msgstr "Connecter les lecteurs clients Ã  l'identification"
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Drive to connect after login"
@@ -160,19 +162,19 @@ msgstr "Lecteur Ã  connecter aprÃ¨s la connexion"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Connect client printers at logon"
-msgstr "Connecter les imprimantes clientes Ã  la connexion"
+msgstr "Connecter les imprimantes clients Ã  l'identification"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Printers to connect after login"
-msgstr "Imprimantes Ã  connecter aprÃ¨s la connexion"
+msgstr "Imprimante Ã  connecter aprÃ¨s la connexion"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default to main client printer"
-msgstr "Met lâ€™imprimante par dÃ©faut sur ce client"
+msgstr "Imprimante par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default printer for this client"
-msgstr "Imprimante par dÃ©faut pour ce client"
+msgstr "Imprimante par dÃ©faut"
 
 #: personal/samba/class_sambaAccount.inc:276
 msgid "Shadowing"
@@ -200,15 +202,15 @@ msgstr "entrÃ©e dÃ©sactivÃ©e, notification dÃ©sactivÃ©e"
 
 #: personal/samba/class_sambaAccount.inc:283
 msgid "On broken or timed out"
-msgstr "Lors dâ€™un problÃ¨me ou temps d'attente dÃ©passÃ©"
+msgstr "Sur interrompu ou temps d'attente dÃ©passÃ©"
 
 #: personal/samba/class_sambaAccount.inc:283
 msgid "What happen if disconnected or timeout"
-msgstr "Qu'arrive t-il en cas de dÃ©connexion ou dâ€™absence de rÃ©ponse"
+msgstr "Qu'arrive t-il en cas de dÃ©connexion ou de temporisation"
 
 #: personal/samba/class_sambaAccount.inc:286
 msgid "disconnect"
-msgstr "dÃ©connecter"
+msgstr "dÃ©connectÃ©"
 
 #: personal/samba/class_sambaAccount.inc:286
 msgid "reset"
@@ -248,11 +250,13 @@ msgstr "Le mot de passe n'expire jamais"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from windows client requires no password"
-msgstr "L'identification depuis une station Windows ne nÃ©cessite pas de mot de passe"
+msgstr ""
+"L'identification sur une station windows ne nÃ©cessite pas de mot de passe"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from a client without a password"
-msgstr "Identification depuis une station Windows sans de mot de passe"
+msgstr ""
+"L'identification sur une station windows ne nÃ©cessite pas de mot de passe"
 
 #: personal/samba/class_sambaAccount.inc:323
 msgid "Lock samba account"
@@ -260,7 +264,7 @@ msgstr "Verrouiller le compte Samba"
 
 #: personal/samba/class_sambaAccount.inc:323
 msgid "Lock the account"
-msgstr "Verrouiller le compte"
+msgstr "Verrouiller le compte Samba"
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Cannot change password"
@@ -272,11 +276,11 @@ msgstr "Interdire le changement de mot de passe"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "Account expiration"
-msgstr "Expiration du compte"
+msgstr "Utiliser l'expiration du compte"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "When does the account expire"
-msgstr "Quand le compte expire-t-il"
+msgstr "Le compte expire aprÃ¨s"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "Samba logon times"
@@ -284,133 +288,139 @@ msgstr "Heures d'accÃ¨s Ã  Samba"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "What is the allowed time to connect"
-msgstr "Quel sont les horaires oÃ¹ la connexion est autorisÃ©e"
+msgstr "Machines qui peuvent se connecter"
 
 #: personal/samba/class_sambaAccount.inc:341
 msgid "Edit settings"
-msgstr "Ã‰diter les paramÃ¨tres"
+msgstr "Editer les paramÃ¨tres"
 
 #: personal/samba/class_sambaAccount.inc:357
 msgid "System trust"
-msgstr "SystÃ¨me de confiance"
+msgstr "SystÃ¨me de Confiance"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Allow connection from these workstations only"
-msgstr "Permet la connexion depuis ces stations seulement"
+msgstr "Permet la connections depuis ces stations seulement"
 
 #: personal/samba/class_sambaAccount.inc:363
 msgid "Only allow this user to connect to this list of hosts"
-msgstr "Autoriser cet utilisateur Ã  se connecter uniquement sur cette liste dâ€™hÃ´tes"
+msgstr "Autoriser seulement cet utilisateur Ã  se connecter sur cet hÃ´te"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
-msgstr "Disque du rÃ©pertoire personnel"
+msgstr "RÃ©pertoire Home"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Chemin du rÃ©pertoire personnel"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
-msgstr "Le gestionnaire d'utilisateurs Windows accepte huit clients maximumâ€¯!"
+msgstr "Le gestionnaire d'utilisateurs windows accepte huit clients maximum !"
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Le SID Samba nâ€™est pas dÃ©fini. Veuillez corriger ceci manuellementâ€¯!"
+msgstr ""
+"DÃ©tection d'un SID Samba non dÃ©fini. Veuillez fixer ceci manuellement !"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Impossible de convertir le groupe principal en un groupe sambaâ€¯: le groupe ne peut Ãªtre identifiÃ©â€¯!"
+msgstr ""
+"Impossible de convertir le groupe primaire en un groupe primaire samba : le "
+"groupe ne peut Ãªtre identifiÃ© !"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
-msgstr "Impossible de convertir le groupe primaire en un groupe primaire samba : l'onglet groupe samba est dÃ©sactivÃ© !"
+msgstr ""
+"Impossible de convertir le groupe primaire en un groupe primaire samba : le "
+"tab samba est dÃ©sactive sur le groupe"
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
-msgstr "Configuration du plugin Samba"
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr "Branche des machines Samba"
+msgstr "Configuration de l'extension Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "L'endroit oÃ¹ FusionDirectory cherche de nouveaux postes de travail samba."
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "Mapping des ID Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "Maintenir des objets sambaIdmapEntry. Selon votre configuration ceci peut amÃ©liorer considÃ©rablement les performances lors des connexion Ã  Windows."
+msgstr ""
+"Maintenir des  objets sambaIdmapEntry. Selon votre configuration ceci peut "
+"amÃ©liorer considÃ©rablement les performances lors des connexion Ã  Windows."
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "SID Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "Un SID samba s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba. Vous pouvez rÃ©cupÃ©rer le sid par net getlocalsid."
+msgstr ""
+"Un SID samba  s'il n'est pas disponible sur le serveur LDAP par le biais du "
+"schÃ©ma samba. Vous pouvez rÃ©cupÃ©rer le sid par net getlocalsid."
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
-msgstr "Base RID Samba"
+msgstr "Samba rid base"
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr "L'identifiant de base Ã  ajouter aux calculs de SID - s'il n'est pas disponible sur le serveur LDAP par le biais du schÃ©ma samba."
+msgstr ""
+"L'identifiant de base Ã  ajouter Ã  des calculs de sid - s'il n'est pas "
+"disponible sur le serveur LDAP par le biais du schÃ©ma samba."
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
-msgstr "Synchronisation de la date d'expiration"
+msgstr "Date d'expiration pour la synchronisation"
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
-msgstr "Synchronisation de la date d'expiration avec la date d'expiration POSIXâ€¯?"
+msgstr "Synchronisation la date d'expiration avec la date d'expiration POSIX?"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
-msgstr "GÃ©nÃ©rer sambaLMPassword"
+msgstr "GÃ©nÃ©rer l\"encodage sambaLMPassword"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
-msgstr "NÃ©cessaire pour Ãªtre conforme avec Windowsâ€¯<=â€¯98 ou Sambaâ€¯<â€¯3.2"
+msgstr "NÃ©cessaire pour Ãªtre conforme avec Windows <= 98 ou Samba <3.2"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr "Activer l'avertissement sur les groupes principaux"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
-msgstr "Ã‰mettre un avertissement si le groupe primaire POSIX ne peut pas Ãªtre converti en groupe primaire Samba lors de l'activation de l'onglet Samba d'un utilisateur"
+msgstr ""
+"Ã‰mettre un avertissement si le groupe primaire POSIX ne peut pas Ãªtre "
+"converti en groupe primaire Samba lors de l'activation de l'onglet Samba "
+"d'un utilisateur"
 
 #: admin/groups/samba/class_sambaGroup.inc:30
 msgid "Samba group settings"
-msgstr "ParamÃ¨tres du groupe Samba"
+msgstr "ParamÃ¨tres des groupes samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:45
 msgid "Samba domain"
-msgstr "Domaine Samba"
+msgstr "Domaines Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
 msgid "Samba information"
@@ -422,7 +432,7 @@ msgstr "Type de groupe"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Samba group type"
-msgstr "Type de groupe Samba"
+msgstr "Groupe Samba"
 
 #: admin/groups/samba/class_sambaGroup.inc:60
 #: admin/groups/samba/class_sambaGroup.inc:120
@@ -457,11 +467,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:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "Domaines Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "Gestion des domaines Samba"
 
@@ -475,7 +485,7 @@ msgid "Samba domain settings"
 msgstr "Configuration domaine Samba"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
@@ -501,7 +511,7 @@ msgstr "Base du RID"
 
 #: admin/samba/class_sambaDomain.inc:62
 msgid "Algorithmic rid base"
-msgstr "Base algorithmique du RID"
+msgstr "Algorithmic rid base"
 
 #: admin/samba/class_sambaDomain.inc:66
 msgid "Minimum password age"
@@ -511,7 +521,9 @@ msgstr "DurÃ©e de vie minimale du mot de passe"
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr "DurÃ©e minimum de validitÃ© du mot de passe, en secondes (dÃ©faut : 0 => permet le changement immÃ©diat du mot de passe)"
+msgstr ""
+"DurÃ©e minimum de validitÃ© du mot de passe, en secondes (dÃ©faut : 0 => permet"
+" le changement immÃ©diat du mot de passe)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
@@ -520,7 +532,9 @@ msgstr "DurÃ©e de vie maximale du mot de passe"
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "DurÃ©e maximum de validitÃ© du mot de passe, en secondes (dÃ©faut : -1 => le mot de passe n'expire jamais)"
+msgstr ""
+"DurÃ©e maximum de validitÃ© du mot de passe, en secondes (dÃ©faut : -1 => le "
+"mot de passe n'expire jamais)"
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
@@ -528,7 +542,7 @@ msgstr "Prochain RID"
 
 #: admin/samba/class_sambaDomain.inc:79
 msgid "Next NT rid to give out for anything"
-msgstr "Prochain RID NT Ã  donner"
+msgstr "Prochain RID NT a donner"
 
 #: admin/samba/class_sambaDomain.inc:83
 msgid "Next group RID"
@@ -536,7 +550,7 @@ msgstr "Prochain RID de groupe"
 
 #: admin/samba/class_sambaDomain.inc:84
 msgid "Next NT rid to give out for groups"
-msgstr "Prochain RID NT Ã  donner pour les groupes"
+msgstr "Prochain rid NT a donner comme groupe"
 
 #: admin/samba/class_sambaDomain.inc:88
 msgid "Next user RID"
@@ -544,7 +558,7 @@ msgstr "Prochain RID utilisateur"
 
 #: admin/samba/class_sambaDomain.inc:89
 msgid "Next NT rid to give our for users"
-msgstr "Prochain RID NT Ã  donner pour les utilisateurs"
+msgstr "Prochain RID NT a donner pour un utilisateur"
 
 #: admin/samba/class_sambaDomain.inc:93
 msgid "Minimum password length"
@@ -552,7 +566,7 @@ msgstr "Taille minimale du mot de passe"
 
 #: admin/samba/class_sambaDomain.inc:94
 msgid "Minimal password length (default: 5)"
-msgstr "Taille de mot de passe minimale (dÃ©faut : 5)"
+msgstr "Taille de mot de passe par dÃ©faut (dÃ©faut : 5)"
 
 #: admin/samba/class_sambaDomain.inc:98
 msgid "Password history length"
@@ -560,23 +574,25 @@ msgstr "Taille de l'historique des mots de passe"
 
 #: admin/samba/class_sambaDomain.inc:99
 msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Taille de l'historique des mots de passe (dÃ©fautâ€¯: 0 => dÃ©sactivÃ©)"
+msgstr "Taille de l'historique des mots de passe (par dÃ©faut :0 => dÃ©sactive)"
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
-msgstr "Se connecter pour changer de mot de passe"
+msgstr "Connectez-vous pour changer de mot de passe"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Force les utilisateurs Ã  se connecter pour changer leur mot de passe (par dÃ©fautâ€¯: 0 => dÃ©sactivÃ©, 2 => activÃ©) "
+msgstr ""
+"Forcer les utilisateurs a se connecter pour changer leur mot de passe (par "
+"dÃ©faut: 0 => dÃ©sactive, 2 => activÃ©) "
 
 #: admin/samba/class_sambaDomain.inc:108
 msgid "Lockout duration"
-msgstr "DurÃ©e de verrouillage "
+msgstr "La durÃ©e de blocage"
 
 #: admin/samba/class_sambaDomain.inc:109
 msgid "Lockout duration in minutes (default: 30, -1 => forever)"
-msgstr "DurÃ©e du blocage du compte en minutes (par dÃ©fautâ€¯: 30, -1 => perpÃ©tuellement)"
+msgstr "DurÃ©e du blocage du compte (par dÃ©faut : 30, -1 => perpÃ©tuellement )"
 
 #: admin/samba/class_sambaDomain.inc:113
 msgid "Lockout observation window"
@@ -584,15 +600,17 @@ msgstr "FenÃªtre de verrouillage"
 
 #: admin/samba/class_sambaDomain.inc:114
 msgid "Reset time after lockout in minutes (default: 30)"
-msgstr "Temps avant remise Ã  zÃ©ro aprÃ¨s verrouillage, en minutes (dÃ©faut : 30)"
+msgstr "Temps de redÃ©marrage aprÃ¨s verrouillage, en minutes (dÃ©faut : 30)"
 
 #: admin/samba/class_sambaDomain.inc:118
 msgid "Lockout threshold"
-msgstr "Seuil de blocage"
+msgstr "La durÃ©e de blocage"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Verrouille le compte utilisateur aprÃ¨s tant dâ€™Ã©checs de tentative de connexion (dÃ©faut : 0 => dÃ©sactivÃ©)"
+msgstr ""
+"Verrouille le compte utilisateur aprÃ¨s Ã©chec de tentative de connexion "
+"(dÃ©faut : 0 => dÃ©sactivÃ©)"
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
@@ -600,7 +618,9 @@ msgstr "Forcer la dÃ©connexion"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "DÃ©connecte les utilisateurs en dehors des heures de connexion (dÃ©faut : -1 => dÃ©sactivÃ©, 0 => actif)"
+msgstr ""
+"DÃ©connecte les utilisateurs en dehors des heures de connexion (dÃ©faut : -1 "
+"=> dÃ©sactivÃ©, 0 => actif)"
 
 #: admin/samba/class_sambaDomain.inc:128
 msgid "Refuse machine password change"
@@ -608,58 +628,22 @@ msgstr "Refuser le changement de mot de passe de la machine"
 
 #: admin/samba/class_sambaDomain.inc:129
 msgid "Allow Machine Password changes (default: 0 => off)"
-msgstr "Autorise les changements de mot de passe machine (dÃ©faut : 0 => dÃ©sactivÃ©)"
-
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "PC Windows"
+msgstr ""
+"Autorise les changements de mot de passe machine (dÃ©faut : 0 => dÃ©sactivÃ©)"
 
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Information du PC Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Station de travail Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Nom du PC Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nom"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Description"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Une courte description de cette machine Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Lieu"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Le lieu de la machine Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Configuration rÃ©seau"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr "Mettre a jour les partages Samba"
 
 #: personal/samba/sambaLogonHours.tpl.c:2
 msgid "Specify the hours this user is allowed to log in"
-msgstr "Indiquez les heures auquel l'utilisateur est autorisÃ© Ã  se connecter"
+msgstr ""
+"SpÃ©cifiez les heures auxquelles cet utilisateur est autorisÃ© Ã  se connecter"
 
 #: personal/samba/sambaLogonHours.tpl.c:5
 msgid "Hour"
-msgstr "Heure"
+msgstr "heure"
diff --git a/samba/locale/hu_HU/fusiondirectory.po b/samba/locale/hu_HU/fusiondirectory.po
index 0c4bb7a0404f471baf10d471c9d5e00428670cf6..9008f69e035892cb245ad62bc84c59493fa5a2f9 100644
--- a/samba/locale/hu_HU/fusiondirectory.po
+++ b/samba/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "NÃ©v"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "LeÃrÃ¡s"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/id/fusiondirectory.po b/samba/locale/id/fusiondirectory.po
index 96d9bb6ccd7154efcfdbeac799af158806bb572d..c9a5709db8cdc7859c14135a5834da3bcd875b05 100644
--- a/samba/locale/id/fusiondirectory.po
+++ b/samba/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/it_IT/fusiondirectory.po b/samba/locale/it_IT/fusiondirectory.po
index f052622e187195b1424e98e9983a47ed7b97d659..a2bf9fafe74cdb026ec0cb8e8d2c95d0558cdffb 100644
--- a/samba/locale/it_IT/fusiondirectory.po
+++ b/samba/locale/it_IT/fusiondirectory.po
@@ -1,20 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:21+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "La vostra installazione PHP non ha nÃ© mhash() nÃ© la funzione hash. Non puo fare hash MD4."
+msgstr ""
+"La vostra installazione PHP non ha nÃ© mhash() nÃ© la funzione hash. Non puo "
+"fare hash MD4."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -34,6 +33,7 @@ msgstr "Samba Munged Dial"
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -69,12 +69,12 @@ msgstr "Path UNC per la cartella personale"
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Dominio"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Nome di dominio Samba"
 
@@ -304,107 +304,113 @@ msgstr "Autorizza la connessione solo da queste workstation"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Cartella personale dell'utente"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Path della cartella personale dell'utente"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "Il gestore degli utenti di Windows accetta solo 8 clienti alla volta!"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Ã‰ stato trovato un SID Samba che non Ã¨ definito. Correggi manualmente !"
+msgstr ""
+"Ã‰ stato trovato un SID Samba che non Ã¨ definito. Correggi manualmente !"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Impossibile convertire il gruppo primario in un gruppo primario di samba : il gruppo non puÃ³ essere identificato !"
+msgstr ""
+"Impossibile convertire il gruppo primario in un gruppo primario di samba : "
+"il gruppo non puÃ³ essere identificato !"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
-msgstr "Impossibile convertire il gruppo principale su Samba; la tab gruppo samba Ã© disabilitata"
+msgstr ""
+"Impossibile convertire il gruppo principale su Samba; la tab gruppo samba Ã© "
+"disabilitata"
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
 msgstr "Configurazione de l plugin samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr "RDN account computer Samba"
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "Il posto dove FusionDirectory cercherÃ  i nuovi computer Windows"
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "Corrispondenze dei SID Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
-msgstr "Mantenere gli oggetti sambaIdmapEntry. A seconda della configurazione puÃ² migliorare drasticamente le prestazioni di accesso di Windows."
+msgstr ""
+"Mantenere gli oggetti sambaIdmapEntry. A seconda della configurazione puÃ² "
+"migliorare drasticamente le prestazioni di accesso di Windows."
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "SID Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
-msgstr "Un samba SID se non ce ne ono di disponibili all'interno della struttura LDAP attraverso lo schema samba. Ãˆ possibile recuperare l'attuale sid da net getlocalsid."
+msgstr ""
+"Un samba SID se non ce ne ono di disponibili all'interno della struttura "
+"LDAP attraverso lo schema samba. Ãˆ possibile recuperare l'attuale sid da net"
+" getlocalsid."
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr "Base rid per Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
-msgstr "L'id di base da aggiungere a calcoli ordinari sid - se non ce ne sono di disponibili all'interno della struttura LDAP attraverso lo schema samba."
+msgstr ""
+"L'id di base da aggiungere a calcoli ordinari sid - se non ce ne sono di "
+"disponibili all'interno della struttura LDAP attraverso lo schema samba."
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr "Data di scadenza della sincronizzazione"
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr "Sincronizzazione della data di scadenza con quella di POSIX ?"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "Creazione password SambaLMP"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "Necessario per essere conforme con Windows <= 98 o Samba < 3.2"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr "Attivare avvertimento gruppo primario"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
-msgstr "Emettere un avviso se il gruppo primario di POSIX non puÃ² essere convertito in un gruppo primario di Samba quando si attiva la scheda Samba di un utente"
+msgstr ""
+"Emettere un avviso se il gruppo primario di POSIX non puÃ² essere convertito "
+"in un gruppo primario di Samba quando si attiva la scheda Samba di un utente"
 
 #: admin/groups/samba/class_sambaGroup.inc:30
 msgid "Samba group settings"
@@ -459,11 +465,11 @@ msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "Nomi di dominio di Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "Gestione di dominio di Samba"
 
@@ -477,7 +483,7 @@ msgid "Samba domain settings"
 msgstr "Impostazioni di dominio di Samba"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "ProprietÃ "
 
@@ -513,7 +519,9 @@ msgstr "Durata di vita minima della password"
 msgid ""
 "Minimum password age, in seconds (default: 0 => allow immediate password "
 "change)"
-msgstr "AnzianitÃ  massima della password, in secondi (predefinito : 0 => permette modifica immediata della password)"
+msgstr ""
+"AnzianitÃ  massima della password, in secondi (predefinito : 0 => permette "
+"modifica immediata della password)"
 
 #: admin/samba/class_sambaDomain.inc:72
 msgid "Maximum password age"
@@ -522,7 +530,9 @@ msgstr "Durata di vita massima della password"
 #: admin/samba/class_sambaDomain.inc:73
 msgid ""
 "Maximum password age, in seconds (default: -1 => never expire passwords)"
-msgstr "AnzianitÃ  massima della password, in secondi (default: -1 -> la password non ha scadenza)"
+msgstr ""
+"AnzianitÃ  massima della password, in secondi (default: -1 -> la password non"
+" ha scadenza)"
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
@@ -562,7 +572,8 @@ msgstr "Cronologia della lunghezza delle password"
 
 #: admin/samba/class_sambaDomain.inc:99
 msgid "Length of Password History Entries (default: 0 => off)"
-msgstr "Lunghezza dell'history di voci della password (predefinito : 0 => off)"
+msgstr ""
+"Lunghezza dell'history di voci della password (predefinito : 0 => off)"
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
@@ -570,7 +581,9 @@ msgstr "Logon per cambiare la password"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
-msgstr "Obbliga gli Utenti a disconnettersi per modificare la password (predefinito: 0 => off, 2 => on)"
+msgstr ""
+"Obbliga gli Utenti a disconnettersi per modificare la password (predefinito:"
+" 0 => off, 2 => on)"
 
 #: admin/samba/class_sambaDomain.inc:108
 msgid "Lockout duration"
@@ -594,7 +607,8 @@ msgstr "Durata del blocco"
 
 #: admin/samba/class_sambaDomain.inc:119
 msgid "Lockout users after bad logon attempts (default: 0 => off)"
-msgstr "Lockout utenti dopo tentativi errati di login (predefinito : 0 => off)"
+msgstr ""
+"Lockout utenti dopo tentativi errati di login (predefinito : 0 => off)"
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
@@ -602,7 +616,9 @@ msgstr "Forza il log off"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
-msgstr "Disconnetti Utenti al di fuori degli orari di accesso (predefinito : -1 => off, 0 => on)"
+msgstr ""
+"Disconnetti Utenti al di fuori degli orari di accesso (predefinito : -1 => "
+"off, 0 => on)"
 
 #: admin/samba/class_sambaDomain.inc:128
 msgid "Refuse machine password change"
@@ -612,48 +628,10 @@ msgstr "Rifiuta la modifica della password del computer"
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr "Permettere cambiamento password del computer (predefinito: 0 => off) "
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Informazione terminale Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Workstation Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "Il nome del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Descrizione"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Una breve descrizione del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalitÃ "
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "L'ubicazione del computer Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Impostazioni di rete"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr "Aggiornare condivisioni Samba"
diff --git a/samba/locale/lv/fusiondirectory.po b/samba/locale/lv/fusiondirectory.po
index 11c8e16b4b93322674d9b25479615128e23bdaf4..1f132a2a75548007b15b1ca4d75a8937b71024d3 100644
--- a/samba/locale/lv/fusiondirectory.po
+++ b/samba/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "BrÄ«dinÄjums"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "VÄrds "
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Apraksts"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "AtraÅ¡anÄs vieta"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/nb/fusiondirectory.po b/samba/locale/nb/fusiondirectory.po
index cd4188198c1d56a0f1a291e559d81249a802a247..e862106bd490d26aa949d1d836d2bb5773a90a72 100644
--- a/samba/locale/nb/fusiondirectory.po
+++ b/samba/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Navn"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/nl/fusiondirectory.po b/samba/locale/nl/fusiondirectory.po
index 5e52d15b9d9c7cd932a369091ef9bbab98d0bf83..34aa26df1f734904f0d38e735fece94f86921e9f 100644
--- a/samba/locale/nl/fusiondirectory.po
+++ b/samba/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -40,7 +42,7 @@ msgstr "Samba Instellingen"
 
 #: personal/samba/class_sambaAccount.inc:183
 msgid "Samba profile"
-msgstr ""
+msgstr "Samba profiel"
 
 #: personal/samba/class_sambaAccount.inc:189
 #: personal/samba/class_sambaAccount.inc:222
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Domein"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Sambe domeinnaam"
 
@@ -80,7 +82,7 @@ msgstr "Inlogscript"
 
 #: personal/samba/class_sambaAccount.inc:203
 msgid "Login script path"
-msgstr ""
+msgstr "Pad van het login script"
 
 #: personal/samba/class_sambaAccount.inc:207
 #: personal/samba/class_sambaAccount.inc:232
@@ -126,7 +128,7 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Connection timeout"
-msgstr ""
+msgstr "Verbinding verbroken"
 
 #: personal/samba/class_sambaAccount.inc:249
 msgid "Timeout when connecting to terminal server"
@@ -162,7 +164,7 @@ msgstr "Verbindt client printers bij inloggen"
 
 #: personal/samba/class_sambaAccount.inc:268
 msgid "Printers to connect after login"
-msgstr ""
+msgstr "Printers die connecteren na het inloggen"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default to main client printer"
@@ -170,7 +172,7 @@ msgstr "Standaard printer als client printer"
 
 #: personal/samba/class_sambaAccount.inc:272
 msgid "Default printer for this client"
-msgstr ""
+msgstr "Standaard printer voor de client"
 
 #: personal/samba/class_sambaAccount.inc:276
 msgid "Shadowing"
@@ -238,11 +240,11 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:313
 msgid "The password never expire"
-msgstr ""
+msgstr "Het wachtwoord vervalt nooit"
 
 #: personal/samba/class_sambaAccount.inc:313
 msgid "The password will never expire"
-msgstr ""
+msgstr "Het wachtwoord zal nooit vervallen"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from windows client requires no password"
@@ -250,7 +252,7 @@ msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 
 #: personal/samba/class_sambaAccount.inc:318
 msgid "Login from a client without a password"
-msgstr ""
+msgstr "Inloggen vanaf een client zonder wachtwoord"
 
 #: personal/samba/class_sambaAccount.inc:323
 msgid "Lock samba account"
@@ -266,7 +268,7 @@ msgstr "Kan paswoord niet wijzigen"
 
 #: personal/samba/class_sambaAccount.inc:328
 msgid "Not allowed to change password"
-msgstr ""
+msgstr "Niet mogelijk om het wachtwoord te wijzigen"
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "Account expiration"
@@ -274,7 +276,7 @@ msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:332
 msgid "When does the account expire"
-msgstr ""
+msgstr "Wanneer zal dit account vervallen"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "Samba logon times"
@@ -282,7 +284,7 @@ msgstr "Samba inlog tijdstippen"
 
 #: personal/samba/class_sambaAccount.inc:340
 msgid "What is the allowed time to connect"
-msgstr ""
+msgstr "Wat is de toegelaten tijd om te verbinden"
 
 #: personal/samba/class_sambaAccount.inc:341
 msgid "Edit settings"
@@ -300,103 +302,99 @@ msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Home drive"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr "Home path"
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr "De windows gebruikers manager laat maximum 8 clients toe!"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: personal/samba/class_sambaAccount.inc:531
-#: personal/samba/class_sambaAccount.inc:552
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. handmatig!"
+msgstr ""
+"Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b."
+" handmatig!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "Kan primaire groep niet in een samba groep omzetten: group kan niet geidentificeerd worden"
+msgstr ""
+"Kan primaire groep niet in een samba groep omzetten: group kan niet "
+"geidentificeerd worden"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:29
 msgid "Samba plugin configuration"
-msgstr ""
+msgstr "Samba plugin configuratie"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
-msgstr ""
+msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
-msgstr ""
+msgstr "Activeer waarschuwingen voor de primaire groep"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -404,19 +402,19 @@ msgstr ""
 
 #: admin/groups/samba/class_sambaGroup.inc:30
 msgid "Samba group settings"
-msgstr ""
+msgstr "Samba groep instellingen"
 
 #: admin/groups/samba/class_sambaGroup.inc:45
 msgid "Samba domain"
-msgstr ""
+msgstr "Samba domein"
 
 #: admin/groups/samba/class_sambaGroup.inc:49
 msgid "Samba information"
-msgstr ""
+msgstr "Samba informatie"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Group type"
-msgstr ""
+msgstr "Groep type"
 
 #: admin/groups/samba/class_sambaGroup.inc:56
 msgid "Samba group type"
@@ -455,25 +453,25 @@ msgstr "Kan de goep SID niet vinden in je configuratie!"
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
-msgstr ""
+msgstr "Samba domeinen"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:30 admin/samba/class_sambaDomain.inc:31
 #: admin/samba/class_sambaDomain.inc:34
 msgid "Samba Domain"
-msgstr ""
+msgstr "Samba domein"
 
 #: admin/samba/class_sambaDomain.inc:35
 msgid "Samba domain settings"
-msgstr ""
+msgstr "Samba domein instellingen"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Eigenschappen"
 
@@ -483,7 +481,7 @@ msgstr "Domein naam"
 
 #: admin/samba/class_sambaDomain.inc:54
 msgid "Name of this domain"
-msgstr ""
+msgstr "Naam van dit domein"
 
 #: admin/samba/class_sambaDomain.inc:58
 msgid "SID"
@@ -491,7 +489,7 @@ msgstr "SID"
 
 #: admin/samba/class_sambaDomain.inc:58
 msgid "SID of this domain"
-msgstr ""
+msgstr "SID van dit domein"
 
 #: admin/samba/class_sambaDomain.inc:62
 msgid "Rid base"
@@ -522,7 +520,7 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:78
 msgid "Next RID"
-msgstr ""
+msgstr "Volgend RID"
 
 #: admin/samba/class_sambaDomain.inc:79
 msgid "Next NT rid to give out for anything"
@@ -530,7 +528,7 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:83
 msgid "Next group RID"
-msgstr ""
+msgstr "Volgende RID group"
 
 #: admin/samba/class_sambaDomain.inc:84
 msgid "Next NT rid to give out for groups"
@@ -546,11 +544,11 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:93
 msgid "Minimum password length"
-msgstr ""
+msgstr "Minimum lengte van het wachtwoord"
 
 #: admin/samba/class_sambaDomain.inc:94
 msgid "Minimal password length (default: 5)"
-msgstr ""
+msgstr "Minimum lengte van het wachtwoord (standaard: 5)"
 
 #: admin/samba/class_sambaDomain.inc:98
 msgid "Password history length"
@@ -562,7 +560,7 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:103
 msgid "Logon to change password"
-msgstr ""
+msgstr "Aanmelden om het wachtwoord te veranderen"
 
 #: admin/samba/class_sambaDomain.inc:104
 msgid "Force Users to logon for password change (default: 0 => off, 2 => on)"
@@ -594,7 +592,7 @@ msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:123
 msgid "Force logoff"
-msgstr ""
+msgstr "Afmelden forceren"
 
 #: admin/samba/class_sambaDomain.inc:124
 msgid "Disconnect Users outside logon hours (default: -1 => off, 0 => on)"
@@ -608,47 +606,9 @@ msgstr "Weiger machine paswoord wijziging"
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows werkstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows werkstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Naam"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Omschrijving"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Plaats"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
+msgstr "Windows workstation informatie"
 
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
diff --git a/samba/locale/pl/fusiondirectory.po b/samba/locale/pl/fusiondirectory.po
index fee98e58576709756d556de90ffa89e1aa3b7d80..f75d895274c0ad7f9a89b4e92500f9b06ef84d68 100644
--- a/samba/locale/pl/fusiondirectory.po
+++ b/samba/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Domena"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr "ZezwÃ³l na poÅ‚Ä…czenia tylko z tych stacji"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr "Specjalna grupa (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Stacja Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Stacja robocza Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Opis"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Lokalizacja"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/pt/fusiondirectory.po b/samba/locale/pt/fusiondirectory.po
index 9f1b7e1ffb716224235847620c88490259767145..5f06f8ffe61fa1fe38a6f7d87027b263d8a7c952 100644
--- a/samba/locale/pt/fusiondirectory.po
+++ b/samba/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalizaÃ§Ã£o"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/pt_BR/fusiondirectory.po b/samba/locale/pt_BR/fusiondirectory.po
index b2aa08a12f618c58148004f8b2e1923e319cad8d..289cce762488f7c55642feb4f1666a31ace68f73 100644
--- a/samba/locale/pt_BR/fusiondirectory.po
+++ b/samba/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Sua instalaÃ§Ã£o do PHP nÃ£o possui mhash() ou a funÃ§Ã£o de hash. Incapaz de realizar hashes MD4."
+msgstr ""
+"Sua instalaÃ§Ã£o do PHP nÃ£o possui mhash() ou a funÃ§Ã£o de hash. Incapaz de "
+"realizar hashes MD4."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -30,6 +33,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +69,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "DomÃnio"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Nome do dominio Samba"
 
@@ -300,36 +304,39 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Permitir apenas que este usuÃ¡rio conecte-se Ã  lista de hosts"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Detectado Samba SID indefinido. Favor corrigir este problema manualmente!"
+msgstr ""
+"Detectado Samba SID indefinido. Favor corrigir este problema manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
-msgstr "NÃ£o Ã© possÃvel converter o grupo principal para o grupo samba: o grupo nÃ£o pode ser identificado!"
+msgstr ""
+"NÃ£o Ã© possÃvel converter o grupo principal para o grupo samba: o grupo nÃ£o "
+"pode ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +346,56 @@ msgid "Samba plugin configuration"
 msgstr "ConfiguraÃ§Ã£o do plugin Samba"
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "A localizaÃ§Ã£o onde o FusionDirectory procura por novas estaÃ§Ãµes de trabalho samba."
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr "Mapeamento Samba ID"
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "Samba SID"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "Gerar sambaLMPassword"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr "NecessÃ¡rio ser compatÃvel com Windows <=98 ou Samba < 3.2"
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +454,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:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +472,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -608,48 +607,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Workstation do Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "O nome do Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Nome"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "DescriÃ§Ã£o"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "Uma pequena descriÃ§Ã£o do winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "LocalizaÃ§Ã£o"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "A localizaÃ§Ã£o do winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "ConfiguraÃ§Ãµes de rede"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/ru/fusiondirectory.po b/samba/locale/ru/fusiondirectory.po
index 291caed79332c311128c885b2c4620df9e21c563..52e6f17aa5443b85d70dc54889c2ba705a25b80d 100644
--- a/samba/locale/ru/fusiondirectory.po
+++ b/samba/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Ð’ Ð²Ð°ÑˆÐµÐ¹ PHP ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÑ‚Ñƒ Ð½Ð¸ mhash() Ð½Ð¸ Ñ…ÑÑˆ-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸. ÐÐµ Ð¼Ð¾Ð³Ñƒ ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ MD4 Ñ…ÑÑˆÐ¸."
+msgstr ""
+"Ð’ Ð²Ð°ÑˆÐµÐ¹ PHP ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð½ÐµÑ‚Ñƒ Ð½Ð¸ mhash() Ð½Ð¸ Ñ…ÑÑˆ-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸. ÐÐµ Ð¼Ð¾Ð³Ñƒ ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ MD4 "
+"Ñ…ÑÑˆÐ¸."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -32,6 +33,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -67,12 +69,12 @@ msgstr "UNC Ð¿ÑƒÑ‚ÑŒ Ðº Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¼Ñƒ Ð´Ð¸ÑÐºÑƒ"
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "Ð”Ð¾Ð¼ÐµÐ½"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Ð˜Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° Samba"
 
@@ -148,7 +150,8 @@ msgstr "Ð¢Ð°Ð¹Ð¼-Ð°ÑƒÑ‚ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ"
 
 #: personal/samba/class_sambaAccount.inc:259
 msgid "Idle timeout before disconnecting from terminal server"
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð±ÐµÐ·Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´ÐµÑ‚ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð¾Ð²"
+msgstr ""
+"Ð’Ñ€ÐµÐ¼Ñ Ð±ÐµÐ·Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾ÑÐ»Ðµ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´ÐµÑ‚ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ Ð¾Ñ‚ ÑÐµÑ€Ð²ÐµÑ€Ð° Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð¾Ð²"
 
 #: personal/samba/class_sambaAccount.inc:264
 msgid "Connect client drives at logon"
@@ -302,36 +305,36 @@ msgstr "Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ñ‚ ÑÑ‚Ð¾Ð¹ Ñ€
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð°Ñ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ðº Ñ…Ð¾ÑÑ‚Ð°Ð¼ Ð¸Ð· ÑÐ¿Ð¸ÑÐºÐ°"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº"
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -341,64 +344,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr "ÐœÐµÑÑ‚Ð¾, Ð³Ð´Ðµ FusionDirectory Ð¸Ñ‰ÐµÑ‚ Ð½Ð¾Ð²Ñ‹Ðµ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ samba."
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr "Ð“ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ sambaLMPassword"
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -457,11 +452,11 @@ msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð½Ð°Ð¹Ñ‚Ð¸ SID Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ Ð² Ð²Ð°ÑˆÐµÐ¹ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€
 msgid "Special group (%d)"
 msgstr "Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð° (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr "Ð”Ð¾Ð¼ÐµÐ½Ñ‹ Samba"
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð°Ð¼Ð¸ Samba"
 
@@ -475,7 +470,7 @@ msgid "Samba domain settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð´Ð¾Ð¼ÐµÐ½Ð° Samba"
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Ð¡Ð²Ð¾Ð¹ÑÑ‚Ð²Ð°"
 
@@ -610,48 +605,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr "Ð Ð°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/ru@petr1708/fusiondirectory.po b/samba/locale/ru@petr1708/fusiondirectory.po
index c62a28e70604e4579e1e383451a785acef10abba..fbad29365565a6f47b90986c2637964ba9f30dce 100644
--- a/samba/locale/ru@petr1708/fusiondirectory.po
+++ b/samba/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/sv/fusiondirectory.po b/samba/locale/sv/fusiondirectory.po
index 77d62621d304934666961f55b0aa9c8c7b84b658..1f4ab9fc3e4db10397d86231b1325a84216fea83 100644
--- a/samba/locale/sv/fusiondirectory.po
+++ b/samba/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,9 @@ msgstr ""
 msgid ""
 "Your PHP install does not have the mhash() nor the hash function. Cannot do "
 "MD4 hashes."
-msgstr "Din PHP-installation har inte mhash() eller hash-funktionen. Kan inte gÃ¶ra MD4-hashar."
+msgstr ""
+"Din PHP-installation har inte mhash() eller hash-funktionen. Kan inte gÃ¶ra "
+"MD4-hashar."
 
 #: personal/samba/class_sambaAccount.inc:31
 msgid "Samba Munged Dial"
@@ -30,6 +33,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +69,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "DomÃ¤n"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "Samba domÃ¤nnamn"
 
@@ -300,36 +304,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "TillÃ¥t anvÃ¤ndaren att endast logga in pÃ¥ denna lista av hosts"
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Varning"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +343,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +451,11 @@ msgstr "Kan inte hitta grupp-SID i konfigurationen"
 msgid "Special group (%d)"
 msgstr "Specialgrupp (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +469,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -608,48 +604,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Winstation"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "Namn"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "Beskrivning"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Plats"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/ug/fusiondirectory.po b/samba/locale/ug/fusiondirectory.po
index 1fece97966a976116520d08987d9b51d6ce1a072..8f44f5c5c5ec7491b4ff53cac12c5102bd79b9c2 100644
--- a/samba/locale/ug/fusiondirectory.po
+++ b/samba/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +30,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr ""
 
@@ -65,12 +66,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +301,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +340,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +448,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +466,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr ""
 
@@ -608,48 +601,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/vi_VN/fusiondirectory.po b/samba/locale/vi_VN/fusiondirectory.po
index d1aba239821afd76eda1f9b71df7e3db5a2fa041..dd767389403e3cdd9c857ce42ff237e2ca7e67ba 100644
--- a/samba/locale/vi_VN/fusiondirectory.po
+++ b/samba/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr "TÃªn miá»n Samba"
 
@@ -300,36 +302,36 @@ msgstr ""
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr "SID cá»§a Samba"
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,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:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "Properties"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "TÃªn"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "MÃ´ táº£"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "Vá»‹ trÃ"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/locale/zh/fusiondirectory.po b/samba/locale/zh/fusiondirectory.po
index 3b77f3c2bb9b2e5095e55f5aa66586a9bf671e2f..b43a08ef004eac14ef1b64703174614cd885f74f 100644
--- a/samba/locale/zh/fusiondirectory.po
+++ b/samba/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: personal/samba/class_sambaAccount.inc:158
 #: config/samba/class_sambaPluginConfig.inc:28
 #: admin/groups/samba/class_sambaGroup.inc:29
+#: admin/systems/samba/class_sambaSystemTab.inc:30
 msgid "Samba"
 msgstr "Samba"
 
@@ -65,12 +67,12 @@ msgstr ""
 #: 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
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Domain"
 msgstr "åŸŸ"
 
 #: personal/samba/class_sambaAccount.inc:199
-#: admin/systems/samba/class_winstationGeneric.inc:85
+#: admin/systems/samba/class_sambaSystemTab.inc:53
 msgid "Samba domain name"
 msgstr ""
 
@@ -300,36 +302,36 @@ msgstr "åªå…è®¸ä»Žè¿™äº›å·¥ä½œç«™å»ºç«‹è¿žæŽ¥"
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:480
+#: personal/samba/class_sambaAccount.inc:478
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:483
+#: personal/samba/class_sambaAccount.inc:481
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:488
+#: personal/samba/class_sambaAccount.inc:486
 msgid "The windows user manager allows eight clients at maximum!"
 msgstr ""
 
-#: 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
+#: personal/samba/class_sambaAccount.inc:503
+#: personal/samba/class_sambaAccount.inc:529
+#: personal/samba/class_sambaAccount.inc:550
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Warning"
 msgstr "è¦å‘Š"
 
-#: personal/samba/class_sambaAccount.inc:505
-#: admin/groups/samba/class_sambaGroup.inc:135
+#: personal/samba/class_sambaAccount.inc:503
+#: admin/groups/samba/class_sambaGroup.inc:133
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:532
+#: personal/samba/class_sambaAccount.inc:530
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:553
+#: personal/samba/class_sambaAccount.inc:551
 msgid ""
 "Cannot convert primary group to samba group: group samba tab is disabled!"
 msgstr ""
@@ -339,64 +341,56 @@ msgid "Samba plugin configuration"
 msgstr ""
 
 #: config/samba/class_sambaPluginConfig.inc:44
-msgid "Samba machine account RDN"
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:44
-msgid "The location where FusionDirectory looks for new samba workstations."
-msgstr ""
-
-#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba ID mapping"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:50
+#: config/samba/class_sambaPluginConfig.inc:45
 msgid ""
 "Maintain sambaIdmapEntry objects. Depending on your setup this can "
 "drastically improve the windows login performance."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:54
+#: config/samba/class_sambaPluginConfig.inc:49
 msgid "Samba SID"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:55
+#: config/samba/class_sambaPluginConfig.inc:50
 msgid ""
 "A samba SID if not available inside of the LDAP though samba schema. You can"
 " retrieve the current sid by net getlocalsid."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:60
+#: config/samba/class_sambaPluginConfig.inc:55
 msgid "Samba rid base"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:61
+#: config/samba/class_sambaPluginConfig.inc:56
 msgid ""
 "The base id to add to ordinary sid calculations - if not available inside of"
 " the LDAP though samba schema."
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Expiration date synchronisaton"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:66
+#: config/samba/class_sambaPluginConfig.inc:61
 msgid "Synchronisaton the expiration date with the POSIX one?"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Generate sambaLMPassword"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:72
+#: config/samba/class_sambaPluginConfig.inc:67
 msgid "Needed to be compliant with Windows <= 98 or Samba < 3.2"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid "Activate primary group warning"
 msgstr ""
 
-#: config/samba/class_sambaPluginConfig.inc:76
+#: config/samba/class_sambaPluginConfig.inc:71
 msgid ""
 "Issue a warning if POSIX primary group cannot be converted to Samba primary "
 "group when activating the Samba tab of a user"
@@ -455,11 +449,11 @@ msgstr ""
 msgid "Special group (%d)"
 msgstr "ç‰¹æ®Šç»„ (%d)"
 
-#: admin/samba/class_sambaDomainManagement.inc:33
+#: admin/samba/class_sambaDomainManagement.inc:34
 msgid "Samba domains"
 msgstr ""
 
-#: admin/samba/class_sambaDomainManagement.inc:34
+#: admin/samba/class_sambaDomainManagement.inc:35
 msgid "Samba domain management"
 msgstr ""
 
@@ -473,7 +467,7 @@ msgid "Samba domain settings"
 msgstr ""
 
 #: admin/samba/class_sambaDomain.inc:51
-#: admin/systems/samba/class_winstationGeneric.inc:61
+#: admin/systems/samba/class_sambaSystemTab.inc:44
 msgid "Properties"
 msgstr "å±žæ€§"
 
@@ -608,48 +602,10 @@ msgstr ""
 msgid "Allow Machine Password changes (default: 0 => off)"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:37
-msgid "Winstation"
-msgstr "Windows å·¥ä½œç«™"
-
-#: admin/systems/samba/class_winstationGeneric.inc:38
+#: admin/systems/samba/class_sambaSystemTab.inc:31
 msgid "Windows workstation information"
 msgstr ""
 
-#: admin/systems/samba/class_winstationGeneric.inc:42
-#: admin/systems/samba/class_winstationGeneric.inc:43
-msgid "Windows workstation"
-msgstr "Windows å·¥ä½œç«™"
-
-#: admin/systems/samba/class_winstationGeneric.inc:70
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "The name of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:74
-msgid "Name"
-msgstr "åç§°"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "Description"
-msgstr "æè¿°"
-
-#: admin/systems/samba/class_winstationGeneric.inc:81
-msgid "A short description of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "Location"
-msgstr "ä½ç½®"
-
-#: admin/systems/samba/class_winstationGeneric.inc:89
-msgid "The location of the winstation"
-msgstr ""
-
-#: admin/systems/samba/class_winstationGeneric.inc:96
-msgid "Network settings"
-msgstr ""
-
 #: admin/systems/samba/class_argonautEventSambaShares.inc:27
 msgid "Update Samba Shares"
 msgstr ""
diff --git a/samba/personal/samba/class_sambaAccount.inc b/samba/personal/samba/class_sambaAccount.inc
index e9cee911252ba60dfb16bb916ca388d72ee85625..e3fc12139bfd38609f85b358df36e0771b867351 100644
--- a/samba/personal/samba/class_sambaAccount.inc
+++ b/samba/personal/samba/class_sambaAccount.inc
@@ -456,8 +456,6 @@ class sambaAccount extends simplePlugin
       }
       $this->attributesAccess['sambaKickoffTime']->setDisabled(TRUE);
     }
-
-    $this->updateAttributesValues();
     $this->prepareSavedAttributes();
   }
 
diff --git a/samba/personal/samba/class_sambaLogonHours.inc b/samba/personal/samba/class_sambaLogonHours.inc
index bfbe8a5daf642c6902dfb8d4bedd03347ca3c7e0..d7408241cd68ce67f3adc71d287072a23a8b6325 100644
--- a/samba/personal/samba/class_sambaLogonHours.inc
+++ b/samba/personal/samba/class_sambaLogonHours.inc
@@ -77,7 +77,6 @@ class sambaLogonHours
   {
     $week_days = msgPool::weekdays();
 
-    $ui     = get_userinfo();
     $smarty = get_smarty();
     $smarty->assign("acl", preg_match("/w/i", $this->acl));
 
@@ -94,9 +93,6 @@ class sambaLogonHours
 
   function save_object()
   {
-    /* Get userinfo */
-    $ui = get_userinfo();
-
     /* Check if dialog was opened and if there were any changes */
     if (isset($_POST['sambaLogonHoursPosted'])) {
       foreach ($this->Matrix as $day_key => $days) {
@@ -115,8 +111,8 @@ class sambaLogonHours
   {
     /* Convert Matrix to Hex */
     $slh = "";
-    foreach ($this->Matrix as $day_key => $days) {
-      foreach ($days as $hour_key => $hour) {
+    foreach ($this->Matrix as $days) {
+      foreach ($days as $hour) {
         $slh .= $hour;
       }
     }
@@ -165,7 +161,7 @@ class SambaLogonHoursDialog
     $this->sambaAttribute = $sambaAttribute;
     $this->dialog         = new sambaLogonHours(
       $sambaAttribute->getValue(),
-      $simplePlugin->getacl('sambaLogonHours')
+      $simplePlugin->aclGetPermissions('sambaLogonHours')
     );
   }
 
diff --git a/samba/personal/samba/sambaLogonHours.tpl b/samba/personal/samba/sambaLogonHours.tpl
index 5d1d8851d9068e7faaa31038bc2270c904b49519..1a2969211e3c66162d922d3a638f785eb6ec1664 100644
--- a/samba/personal/samba/sambaLogonHours.tpl
+++ b/samba/personal/samba/sambaLogonHours.tpl
@@ -30,7 +30,7 @@
   <tr>
     <td style="text-align: left;" class="list0">&nbsp;</td>
     {foreach from=$Hours item=hours key=key_hours}
-      {if (($hours)%2) < 1}
+      {if (($hours)%2)==0}
         <td style="text-align:center;height: 22px; background-color: rgb(226, 226, 226); ">
       {else}
         <td style="text-align:center;height: 22px; background-color: rgb(245, 245, 245); border-right: solid 1px #B0B0B0;">
@@ -48,7 +48,7 @@
       &nbsp;
     </td>
     {foreach from=$Hours item=hours key=key_hours}
-      {if (($hours)%2) < 1}
+      {if (($hours)%2)==0}
         <td style="text-align:center; height: 22px; background-color: rgb(226, 226, 226); text-align: right;">
       {else}
         <td style="text-align:center; height: 22px; background-color: rgb(245, 245, 245); border-right: solid 1px #B0B0B0; text-align: right;">
@@ -70,7 +70,7 @@
       <b>{$Days[$key_day]}</b>
     </td>
     {foreach from=$days item=hours key=key_hour}
-      {if (($key_hour)%2) < 1}
+      {if (($key_hour)%2)==0}
         <td style="text-align:center;height: 22px; background-color: rgb(226, 226, 226); ">
       {else}
         <td style="text-align:center;height: 22px; background-color: rgb(245, 245, 245); border-right: solid 1px;">
diff --git a/sogo/admin/sogo/class_sogoManagement.inc b/sogo/admin/sogo/class_sogoManagement.inc
index 1c34dd4e7dba613aef51851b174afb2c24ab59fb..6aafac3020df00f2132f2df0e7fe588dc33b308d 100644
--- a/sogo/admin/sogo/class_sogoManagement.inc
+++ b/sogo/admin/sogo/class_sogoManagement.inc
@@ -20,6 +20,7 @@
 
 class sogoManagement extends simpleManagement
 {
+  // Tab definition
   protected $objectTypes  = array('sogoResource');
 
   protected $departmentBrowser      = TRUE;
diff --git a/sogo/locale/ar/fusiondirectory.po b/sogo/locale/ar/fusiondirectory.po
index 8f1b1d7b3ed5207d82229b9bebfad3e2c8bc65b7..542f38b0885c73438e020ad3566aaf3c79a13c64 100644
--- a/sogo/locale/ar/fusiondirectory.po
+++ b/sogo/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ca/fusiondirectory.po b/sogo/locale/ca/fusiondirectory.po
index 384c85af433badf6d8ab98d0f9042b80b6fc7ddc..c1f0ebc4ddfb22c98f01d3ac3343aecff82d8b53 100644
--- a/sogo/locale/ca/fusiondirectory.po
+++ b/sogo/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/cs_CZ/fusiondirectory.po b/sogo/locale/cs_CZ/fusiondirectory.po
index 01fe4495d73658f8ade3991dd459f57606b9220f..d82bceb118c88a4e2bec63f8fad610eddffcd7e4 100644
--- a/sogo/locale/cs_CZ/fusiondirectory.po
+++ b/sogo/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -53,11 +54,11 @@ msgstr "NÃ¡zev ÃºÄtu"
 
 #: admin/sogo/class_sogoResource.inc:61
 msgid "Mail"
-msgstr "E-mail"
+msgstr "e-mail"
 
 #: admin/sogo/class_sogoResource.inc:67
 msgid "description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/sogo/class_sogoResource.inc:71
 msgid "Multiplebookings"
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Druh"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "SprÃ¡va SOGo"
diff --git a/sogo/locale/de/fusiondirectory.po b/sogo/locale/de/fusiondirectory.po
index d469c66355bbb4f16c228a9626ae9d0aa6560c6c..b832173aae711d33b3a1659e891ea14ebd1c7d57 100644
--- a/sogo/locale/de/fusiondirectory.po
+++ b/sogo/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -68,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr "Art"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "SOGo-Verwaltung"
diff --git a/sogo/locale/el_GR/fusiondirectory.po b/sogo/locale/el_GR/fusiondirectory.po
index a719441a42f098e87a451a66f36b36c02f4e7335..ce6a6f1a3829d5ed0e0d23f64deaefd242128eee 100644
--- a/sogo/locale/el_GR/fusiondirectory.po
+++ b/sogo/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -68,6 +68,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Î•Î¯Î´Î¿Ï‚"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· SOGo"
diff --git a/sogo/locale/en/fusiondirectory.po b/sogo/locale/en/fusiondirectory.po
index f7f9021ba7011fcc0d9a28b70cfe2544c264494d..69c466d84f3ef5dce471a846be6205377a819bf9 100644
--- a/sogo/locale/en/fusiondirectory.po
+++ b/sogo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/es/fusiondirectory.po b/sogo/locale/es/fusiondirectory.po
index ae1ef4caba1d56cd7c8e52ebbd000e0f6918bfd0..7dd5e3a972faeee9e65994ad048bba00e1868c63 100644
--- a/sogo/locale/es/fusiondirectory.po
+++ b/sogo/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/es_CO/fusiondirectory.po b/sogo/locale/es_CO/fusiondirectory.po
index 16f6df7bdefd0be4015ec0584747e1cf61adf838..1a86f895729f8c7bee7a8382c9ecc21f41a4fdc4 100644
--- a/sogo/locale/es_CO/fusiondirectory.po
+++ b/sogo/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/es_VE/fusiondirectory.po b/sogo/locale/es_VE/fusiondirectory.po
index ee5463516a4948734b6992dedf8ecb853d41eae9..7564cf70fe85d920125aeae578d06846d1737f5c 100644
--- a/sogo/locale/es_VE/fusiondirectory.po
+++ b/sogo/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fa_IR/fusiondirectory.po b/sogo/locale/fa_IR/fusiondirectory.po
index c4507cdb5aea2709dd6bf0f418a5929706dbc228..c2fd5dda210614db0c40a108c99053091f806b6b 100644
--- a/sogo/locale/fa_IR/fusiondirectory.po
+++ b/sogo/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fi_FI/fusiondirectory.po b/sogo/locale/fi_FI/fusiondirectory.po
index 927b709cb82d25455737c2b6a8abab3f5928a9d6..e0b1073487820d43b1cf235e2672279086b5c1f2 100644
--- a/sogo/locale/fi_FI/fusiondirectory.po
+++ b/sogo/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/fr/fusiondirectory.po b/sogo/locale/fr/fusiondirectory.po
index ea7420eb69ba3f6f09b84502c47a92945601edc5..4fc1dc9ea00b37b7d3254fd9082934446b9ca491 100644
--- a/sogo/locale/fr/fusiondirectory.po
+++ b/sogo/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,18 +26,18 @@ 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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
-msgstr "Branche SOGo"
+msgstr "SOGo RDN"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "Branch in which SOGo objects will be stored"
-msgstr "Branche oÃ¹ les objets SOGo seront stockÃ©s"
+msgstr "Branche oÃ¹ seront stockÃ©s les objets SOGo"
 
 #: admin/sogo/class_sogoResource.inc:31 admin/sogo/class_sogoResource.inc:32
 #: admin/sogo/class_sogoResource.inc:35 admin/sogo/class_sogoResource.inc:53
@@ -55,20 +54,20 @@ msgstr "Nom du compte"
 
 #: admin/sogo/class_sogoResource.inc:61
 msgid "Mail"
-msgstr "Courriel"
+msgstr "Messagerie"
 
 #: admin/sogo/class_sogoResource.inc:67
 msgid "description"
-msgstr "description"
+msgstr "Description"
 
 #: admin/sogo/class_sogoResource.inc:71
 msgid "Multiplebookings"
-msgstr "RÃ©servations multiples"
+msgstr "Nombre rÃ©servation maximum"
 
 #: admin/sogo/class_sogoResource.inc:76
 msgid "Kind"
 msgstr "Type"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "Gestion SOGo"
diff --git a/sogo/locale/hu_HU/fusiondirectory.po b/sogo/locale/hu_HU/fusiondirectory.po
index 32e72a489384a48fe27d4a30cb92e54e34417f82..b72e4c82302effe1dc2231d5038642cda5dbe47a 100644
--- a/sogo/locale/hu_HU/fusiondirectory.po
+++ b/sogo/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/id/fusiondirectory.po b/sogo/locale/id/fusiondirectory.po
index 7f9df17ee1b7e937e792e287a30b1f8afa73e613..a2f5ae09979d9dac02f94b0e52be648792afddd9 100644
--- a/sogo/locale/id/fusiondirectory.po
+++ b/sogo/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/it_IT/fusiondirectory.po b/sogo/locale/it_IT/fusiondirectory.po
index 133e838c4b801170ca104fbf4da3e37641c7b460..34048d5aafaf8f89455e17b06926dc884802dd3f 100644
--- a/sogo/locale/it_IT/fusiondirectory.po
+++ b/sogo/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2016
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:28+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,8 +26,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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -48,7 +46,7 @@ msgstr "Risorsa di SOGo"
 
 #: admin/sogo/class_sogoResource.inc:57
 msgid "Entry name"
-msgstr "Nome della voce"
+msgstr "nome della voce"
 
 #: admin/sogo/class_sogoResource.inc:57
 msgid "Account name"
@@ -70,6 +68,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "Gestione di SOGo"
diff --git a/sogo/locale/lv/fusiondirectory.po b/sogo/locale/lv/fusiondirectory.po
index fe1277ee25dc30229f2c5f462e513ad7bd4d24b7..ce4fed6a69911caab15f5740fa62d4214631c6d4 100644
--- a/sogo/locale/lv/fusiondirectory.po
+++ b/sogo/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/nb/fusiondirectory.po b/sogo/locale/nb/fusiondirectory.po
index b05a2c100b01b9374abcf465352652703ad0203e..67e5c8ff5fbc487e125ef25b651acb18572d38c3 100644
--- a/sogo/locale/nb/fusiondirectory.po
+++ b/sogo/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/nl/fusiondirectory.po b/sogo/locale/nl/fusiondirectory.po
index 94e8bea2a9ae4a65e387b95ea8b47bbe5819e6b2..07b1489538b60701e76cf604a9210913fb0df62e 100644
--- a/sogo/locale/nl/fusiondirectory.po
+++ b/sogo/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: config/sogo/class_sogoConfig.inc:28
 msgid "SOGo configuration"
-msgstr ""
+msgstr "SOGo configuratie"
 
 #: config/sogo/class_sogoConfig.inc:29
 msgid "FusionDirectory sogo plugin configuration"
-msgstr ""
+msgstr "FusionDirectory sogo plugin configuratie"
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
-msgstr ""
+msgstr "SOGo"
 
 #: config/sogo/class_sogoConfig.inc:45
 msgid "SOGo RDN"
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pl/fusiondirectory.po b/sogo/locale/pl/fusiondirectory.po
index 981e0cd8431576e558653eea3e06c169d4661b24..25e83f1e703671636728fc94095bf4bf5cdf099d 100644
--- a/sogo/locale/pl/fusiondirectory.po
+++ b/sogo/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pt/fusiondirectory.po b/sogo/locale/pt/fusiondirectory.po
index bb8a851fc133742ba171381960359487d339ab04..759d962a35eaf6d8bb6da8f53e9b8a19672d06d2 100644
--- a/sogo/locale/pt/fusiondirectory.po
+++ b/sogo/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/pt_BR/fusiondirectory.po b/sogo/locale/pt_BR/fusiondirectory.po
index db3f9806a942259ace0740dd1bfb6d1fa5003889..d903a80afa2906ae6329c1799db41f2bcc6af46d 100644
--- a/sogo/locale/pt_BR/fusiondirectory.po
+++ b/sogo/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,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:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr "SOGo"
 
@@ -67,6 +68,6 @@ msgstr "Multiplebookings"
 msgid "Kind"
 msgstr "Tipo"
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr "Gerenciar SOGo"
diff --git a/sogo/locale/ru/fusiondirectory.po b/sogo/locale/ru/fusiondirectory.po
index a7d36e9bb1a4a503f2ce45006fbcda8ed92e3ad2..4d8e77245a638b3c7b8ca33e2332e9798747c554 100644
--- a/sogo/locale/ru/fusiondirectory.po
+++ b/sogo/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ru@petr1708/fusiondirectory.po b/sogo/locale/ru@petr1708/fusiondirectory.po
index daac85e6823d62913b621c49a4f77d422b1ec5d3..ac8a0a74bb6e400a00f43d583d3c017f72c9a781 100644
--- a/sogo/locale/ru@petr1708/fusiondirectory.po
+++ b/sogo/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/sv/fusiondirectory.po b/sogo/locale/sv/fusiondirectory.po
index 19a93ad981b02b16c13e82082d8a2bc7b1a980df..31cacaaa02d5b7f12b76853b9d322a02210ab134 100644
--- a/sogo/locale/sv/fusiondirectory.po
+++ b/sogo/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/ug/fusiondirectory.po b/sogo/locale/ug/fusiondirectory.po
index 35c1ef22858a5fb321c294a8709cb8d008bdb77a..f4a97b2283bf09894ac5dd0df30b3efc7884f1fc 100644
--- a/sogo/locale/ug/fusiondirectory.po
+++ b/sogo/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +25,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +67,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/vi_VN/fusiondirectory.po b/sogo/locale/vi_VN/fusiondirectory.po
index 99c1a3faed060b31f9e9ea6e6bd586be9bd53c9e..02c6affb09ad79daaac4cc2fe7c6fe6f8268ae6a 100644
--- a/sogo/locale/vi_VN/fusiondirectory.po
+++ b/sogo/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/sogo/locale/zh/fusiondirectory.po b/sogo/locale/zh/fusiondirectory.po
index f0f8b55f12a50daf22a56e53beb11276645eca9f..914aabe2b45a9703da353c620c4f2c039cc40caf 100644
--- a/sogo/locale/zh/fusiondirectory.po
+++ b/sogo/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,8 +26,8 @@ msgstr ""
 msgid "FusionDirectory sogo plugin configuration"
 msgstr ""
 
-#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:32
-#: admin/sogo/class_sogoManagement.inc:37
+#: config/sogo/class_sogoConfig.inc:42 admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:38
 msgid "SOGo"
 msgstr ""
 
@@ -67,6 +68,6 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
-#: admin/sogo/class_sogoManagement.inc:33
+#: admin/sogo/class_sogoManagement.inc:34
 msgid "SOGo management"
 msgstr ""
diff --git a/spamassassin/locale/ar/fusiondirectory.po b/spamassassin/locale/ar/fusiondirectory.po
index 6fb77593bd4dbee792b6bde3b6dfe9de0b21cd0b..fbcef8dfb268cf8cea141db6b55bd2302ad3d20e 100644
--- a/spamassassin/locale/ar/fusiondirectory.po
+++ b/spamassassin/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/ca/fusiondirectory.po b/spamassassin/locale/ca/fusiondirectory.po
index c843a38f85b69dd96dee31b11c6325cacf9390de..030b2ae7fad99fdaf4ce475c0915be07431f42ad 100644
--- a/spamassassin/locale/ca/fusiondirectory.po
+++ b/spamassassin/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/cs_CZ/fusiondirectory.po b/spamassassin/locale/cs_CZ/fusiondirectory.po
index 47f1edd456a5bb5269da0e94c15158654eb65c6b..cb527b03a19979497b89889f1e382a51c62af3c7 100644
--- a/spamassassin/locale/cs_CZ/fusiondirectory.po
+++ b/spamassassin/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +61,7 @@ msgstr "SluÅ¾ba Spamassassin"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
@@ -68,19 +69,21 @@ msgstr "OznaÄovÃ¡nÃ nevyÅ¾Ã¡danÃ© poÅ¡ty"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:49
 msgid "Rewrite header"
-msgstr "PÅ™epsat hlaviÄku"
+msgstr "pÅ™epsat hlaviÄku"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Required score"
-msgstr "PotÅ™ebnÃ½ stupeÅˆ hodnocenÃ"
+msgstr "potÅ™ebnÃ½ stupeÅˆ hodnocenÃ"
 
 #: 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"
+msgstr ""
+"zvolte stupeÅˆ hodnocenÃ, po jehoÅ¾ dosaÅ¾enÃ bude zprÃ¡va povaÅ¾ovÃ¡na za "
+"nevyÅ¾Ã¡danou (SPAM)"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
-msgstr "DÅ¯vÄ›ryhodnÃ© sÃtÄ›"
+msgstr "dÅ¯vÄ›ryhodnÃ© sÃtÄ›"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:66
 msgid "Flags"
@@ -88,7 +91,7 @@ msgstr "PÅ™Ãznaky"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:69
 msgid "Enable use of bayes filtering"
-msgstr "PouÅ¾Ãvat k filtrovÃ¡nÃ zprÃ¡v algoritmus Bayes"
+msgstr "pouÅ¾Ãvat k filtrovÃ¡nÃ zprÃ¡v algoritmu Bayes"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:74
 msgid "Enable bayes auto learning"
@@ -96,11 +99,11 @@ msgstr "PouÅ¾Ãvat samouÄÃcÃ reÅ¾im algoritmu Bayes"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:79
 msgid "Enable RBL checks"
-msgstr "Zapnout kontrolu RBL"
+msgstr "zapnout kontrolu RBL"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:84
 msgid "Enable use of Razor"
-msgstr "PouÅ¾Ãvat Razor"
+msgstr "pouÅ¾Ãvat Razor"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:89
 msgid "Enable use of DCC"
@@ -108,11 +111,11 @@ msgstr "Zapnout pouÅ¾ÃvÃ¡nÃ DCC"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:94
 msgid "Enable use of Pyzor"
-msgstr "PouÅ¾Ãvat Pyzor"
+msgstr "pouÅ¾Ãvat Pyzor"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:109
 msgid "Rules"
-msgstr "Pravidla"
+msgstr "pravidla"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:113
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:121
@@ -121,8 +124,8 @@ msgstr "Upravit pravidlo pro nevyÅ¾Ã¡danou poÅ¡tu"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
-msgstr "Pravidlo"
+msgstr "pravidlo"
diff --git a/spamassassin/locale/de/fusiondirectory.po b/spamassassin/locale/de/fusiondirectory.po
index b3f7aec8893b61fabcafd9b91c2b57f4a98a9dc4..148afe135919b0820d2377b1c01525f0bb802ba7 100644
--- a/spamassassin/locale/de/fusiondirectory.po
+++ b/spamassassin/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:37+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,7 +77,8 @@ msgstr "BenÃ¶tigter Wert"
 
 #: 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."
+msgstr ""
+"WÃ¤hlen Sie den gewÃ¼nschten Wert, ab dem Mail als Spam gekennzeichnet wird."
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
diff --git a/spamassassin/locale/el_GR/fusiondirectory.po b/spamassassin/locale/el_GR/fusiondirectory.po
index fef59038db080e3785c3dcf4ea0b8dcc0241ee6d..33626cd4955e673b3207b2b092bd50497d203b90 100644
--- a/spamassassin/locale/el_GR/fusiondirectory.po
+++ b/spamassassin/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,7 +77,8 @@ msgstr "Î‘Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î· Î²Î±Î¸Î¼Î¿Î»Î¿Î³Î¯Î±"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:53
 msgid "Select required score to tag mail as spam"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î·Î½ Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î· Î²Î±Î¸Î¼Î¿Î»Î¿Î³Î¯Î± Î³Î¹Î± Î½Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„ÎµÎ¯ ÎÎ½Î± Î¼Î®Î½Ï…Î¼Î± Ï‰Ï‚ spam"
+msgstr ""
+"Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Ï„Î·Î½ Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î· Î²Î±Î¸Î¼Î¿Î»Î¿Î³Î¯Î± Î³Î¹Î± Î½Î± Ï‡Î±ÏÎ±ÎºÏ„Î·ÏÎ¹ÏƒÏ„ÎµÎ¯ ÎÎ½Î± Î¼Î®Î½Ï…Î¼Î± Ï‰Ï‚ spam"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
diff --git a/spamassassin/locale/en/fusiondirectory.po b/spamassassin/locale/en/fusiondirectory.po
index 9f02018f29f5f584349039b90ba8a74a7bd2ebd0..b1c0222d8bc2513fe97325946cff3228c7d4d5bc 100644
--- a/spamassassin/locale/en/fusiondirectory.po
+++ b/spamassassin/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/spamassassin/locale/es/fusiondirectory.po b/spamassassin/locale/es/fusiondirectory.po
index cae3acb5e70f52f6dc0ebaa126543be417a59098..8c3eea95c2a5a502f5362cbc3891c91c4d3c22b3 100644
--- a/spamassassin/locale/es/fusiondirectory.po
+++ b/spamassassin/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/es_CO/fusiondirectory.po b/spamassassin/locale/es_CO/fusiondirectory.po
index 97764a215cfdaeec52fb364d598b18f109505ec0..6732d8e935b198ecd3a833cc93bb7c10572a9787 100644
--- a/spamassassin/locale/es_CO/fusiondirectory.po
+++ b/spamassassin/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/es_VE/fusiondirectory.po b/spamassassin/locale/es_VE/fusiondirectory.po
index bffc203cd7fe5a2cd549c7ed2e1d6c9fa1e1c3fd..652f8f3e1f1ca2bd31ceadd84533be138c46f436 100644
--- a/spamassassin/locale/es_VE/fusiondirectory.po
+++ b/spamassassin/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/fa_IR/fusiondirectory.po b/spamassassin/locale/fa_IR/fusiondirectory.po
index 00d058520e6b2208380410e20c5e77c1872a1cc6..871fa5077282480856b6cf095367d73db4066c31 100644
--- a/spamassassin/locale/fa_IR/fusiondirectory.po
+++ b/spamassassin/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/fi_FI/fusiondirectory.po b/spamassassin/locale/fi_FI/fusiondirectory.po
index 2db5d2956ed6a1b2ce308b8989404cd775e1b0e7..82ebbcf3d7100ad8a7f0dbd6c30f386aef104a65 100644
--- a/spamassassin/locale/fi_FI/fusiondirectory.po
+++ b/spamassassin/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/fr/fusiondirectory.po b/spamassassin/locale/fr/fusiondirectory.po
index f2a1bfca60c17a9aaca64227868fe4c6c3d13c6d..7e318ef3809f9f96e16cb8930be678d4720aa409 100644
--- a/spamassassin/locale/fr/fusiondirectory.po
+++ b/spamassassin/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,7 +61,7 @@ msgstr "Service Spamassassin"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:32
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:46
 msgid "Spam tagging"
@@ -77,7 +77,8 @@ msgstr "Score requis"
 
 #: 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"
+msgstr ""
+"SÃ©lectionner le score requis pour marquer un message comme Ã©tant un spam"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:59
 msgid "Trusted networks"
diff --git a/spamassassin/locale/hu_HU/fusiondirectory.po b/spamassassin/locale/hu_HU/fusiondirectory.po
index 7ca332eab92bfa40684a54040cc2b90095313fe1..e4bd543b8685b0a587777ae712d5b959edd9c216 100644
--- a/spamassassin/locale/hu_HU/fusiondirectory.po
+++ b/spamassassin/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/id/fusiondirectory.po b/spamassassin/locale/id/fusiondirectory.po
index e4e834af50afccc41a6f75be316268df8f9d6345..8eec4fd2e9a2ae744c6309eddab0ffe144894508 100644
--- a/spamassassin/locale/id/fusiondirectory.po
+++ b/spamassassin/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/it_IT/fusiondirectory.po b/spamassassin/locale/it_IT/fusiondirectory.po
index 8dfd547fbb0f95121c2ac7d8e0f090d8eaa90756..28a638ea4a15b9e050f881dd0a6d75fb512afdd9 100644
--- a/spamassassin/locale/it_IT/fusiondirectory.po
+++ b/spamassassin/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:28+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/lv/fusiondirectory.po b/spamassassin/locale/lv/fusiondirectory.po
index b3641c345b1accd29269ffa66c828fe38720f8f4..898c9a4ae6304d599e4afe5a1c4eb209cf6a8c12 100644
--- a/spamassassin/locale/lv/fusiondirectory.po
+++ b/spamassassin/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/nb/fusiondirectory.po b/spamassassin/locale/nb/fusiondirectory.po
index 45ae0868118eb91a371e7544b744a5043b3a0661..b224bab116a4ff085aba952e93904796260b0e0a 100644
--- a/spamassassin/locale/nb/fusiondirectory.po
+++ b/spamassassin/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/nl/fusiondirectory.po b/spamassassin/locale/nl/fusiondirectory.po
index db6bc4ef084893f7f2cf6467661d7f79a2e971a8..38e250dd6574e7976d9751f4e3d1aa1521371521 100644
--- a/spamassassin/locale/nl/fusiondirectory.po
+++ b/spamassassin/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: personal/spamassassin/class_spamAssassinAccount.inc:31
 msgid "Spam rules"
-msgstr ""
+msgstr "Spam regels"
 
 #: personal/spamassassin/class_spamAssassinAccount.inc:38
 msgid "SpamAssassin user preferences settings"
@@ -35,7 +36,7 @@ msgstr ""
 
 #: personal/spamassassin/class_spamAssassinAccount.inc:47
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #: personal/spamassassin/class_spamAssassinAccount.inc:47
 msgid "The value for the directive"
diff --git a/spamassassin/locale/pl/fusiondirectory.po b/spamassassin/locale/pl/fusiondirectory.po
index 08b027b197ad92a5c85513629bb5c643ed297cde..f0dc765d1f3a23646656d5eb550e9047b77d0b31 100644
--- a/spamassassin/locale/pl/fusiondirectory.po
+++ b/spamassassin/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/pt/fusiondirectory.po b/spamassassin/locale/pt/fusiondirectory.po
index b0bad7b41ce398c8f66df483ada43b65c6c34616..b83bde7efa94762a59caec5010f204b5c3f62aef 100644
--- a/spamassassin/locale/pt/fusiondirectory.po
+++ b/spamassassin/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/pt_BR/fusiondirectory.po b/spamassassin/locale/pt_BR/fusiondirectory.po
index 2e6c3ad5ed78833e1dd811c2c06a604bfe8b966c..8f40240f8e6af6e1b3d55146ff68e6c5e503e154 100644
--- a/spamassassin/locale/pt_BR/fusiondirectory.po
+++ b/spamassassin/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/ru/fusiondirectory.po b/spamassassin/locale/ru/fusiondirectory.po
index 0ec8858c0574153cee63aac77bbe5757be4c8d35..d9a94f1626f7367a06a17121336759500b09cff7 100644
--- a/spamassassin/locale/ru/fusiondirectory.po
+++ b/spamassassin/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -121,7 +122,7 @@ msgstr ""
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:116
 msgid "Name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
 #: admin/systems/services/spam/class_serviceSpamAssassin.inc:117
 msgid "Rule"
diff --git a/spamassassin/locale/ru@petr1708/fusiondirectory.po b/spamassassin/locale/ru@petr1708/fusiondirectory.po
index adc3ce998db3029742b886c63afde25b3356c9cc..6d37fa24804f75d11f6c3886b97cc3564729223c 100644
--- a/spamassassin/locale/ru@petr1708/fusiondirectory.po
+++ b/spamassassin/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/sv/fusiondirectory.po b/spamassassin/locale/sv/fusiondirectory.po
index 2c2b8b355aecfa7d54b42080f61c26b7e56be803..8eb2b48d4efa13405ff073f97d8dc9c82fd56c17 100644
--- a/spamassassin/locale/sv/fusiondirectory.po
+++ b/spamassassin/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/ug/fusiondirectory.po b/spamassassin/locale/ug/fusiondirectory.po
index 203716ab1faf4a9f697e9709eb8363c23fe7aca5..10f63f1729ec3bfecbb7b699255d25a66c173f7a 100644
--- a/spamassassin/locale/ug/fusiondirectory.po
+++ b/spamassassin/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/vi_VN/fusiondirectory.po b/spamassassin/locale/vi_VN/fusiondirectory.po
index 137d5e1e101dc30aa256bb88fba460bdb33796c0..712eeb485ebcc4ca86637d0d106077ef46941c44 100644
--- a/spamassassin/locale/vi_VN/fusiondirectory.po
+++ b/spamassassin/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/spamassassin/locale/zh/fusiondirectory.po b/spamassassin/locale/zh/fusiondirectory.po
index 4f0bd9e29ee59fc522f00d1818f480efeb5822c7..35d83b53da7f6460131f35d9a6cc439465ca319f 100644
--- a/spamassassin/locale/zh/fusiondirectory.po
+++ b/spamassassin/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/squid/locale/ar/fusiondirectory.po b/squid/locale/ar/fusiondirectory.po
index 21b005309dedc2e4ba5e880e0f8b0bd486d46469..b31004b1c0b6f0771e310060eee32ccd26647657 100644
--- a/squid/locale/ar/fusiondirectory.po
+++ b/squid/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "Ø³Ø§Ø¹Ø©"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "ÙŠÙˆÙ…"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "Ø£Ø³Ø¨ÙˆØ¹"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "Ø´Ù‡Ø±"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/ca/fusiondirectory.po b/squid/locale/ca/fusiondirectory.po
index 07c99821957272a9b5d0ae8eca17fc50fba8f951..2935ac0d48506d85c10f160e8051d124d011d675 100644
--- a/squid/locale/ca/fusiondirectory.po
+++ b/squid/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/cs_CZ/fusiondirectory.po b/squid/locale/cs_CZ/fusiondirectory.po
index 971c5de2848c9a0ed5eaae00b6dd0b67d51b1c98..3355270d820f6e4d2c463bad956f587cb45bb7bc 100644
--- a/squid/locale/cs_CZ/fusiondirectory.po
+++ b/squid/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,19 +20,21 @@ msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:65
 msgid "Proxy"
-msgstr "Proxy"
+msgstr "proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Toto umoÅ¾Åˆuje uchovÃ¡vat zÃ¡kladnÃ nastavenÃ pro squid proxy v ldap, pro kaÅ¾dÃ©ho z uÅ¾ivatelÅ¯ zvlÃ¡Å¡Å¥"
+msgstr ""
+"Toto umoÅ¾Åˆuje uchovÃ¡vat zÃ¡kladnÃ nastavenÃ pro squid proxy v ldap, pro "
+"kaÅ¾dÃ©ho z uÅ¾ivatelÅ¯ zvlÃ¡Å¡Å¥"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
-msgstr "ÃšÄet pro proxy"
+msgstr "ÃºÄet proxy"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "NepropouÅ¡tÄ›t neÅ¾Ã¡doucÃ obsah (tj. pornografii Äi nÃ¡silÃ)"
+msgstr "nepropouÅ¡tÄ›t neÅ¾Ã¡doucÃ obsah (tj. pornografii Äi nÃ¡silÃ)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -43,7 +45,7 @@ msgid "Working Start"
 msgstr "ZaÄÃ¡tek pracovnÃ doby"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -51,68 +53,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
-msgstr "Omezit pÅ™Ãstup k proxy jen na pracovnÃ dobu"
+msgstr "Povol pÅ™Ãstup k proxy jen v pracovnÃ dobu."
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Konec pracovnÃ doby"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "â€“"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
-msgstr "Stanovit kvÃ³tu na vyuÅ¾ÃvÃ¡nÃ proxy"
+msgstr "omez vyuÅ¾ÃvÃ¡nÃ proxy pomocÃ kvÃ³t"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
-msgstr "Nahoru"
+msgstr "nahoru"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "za"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "hodina"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "den"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "tÃ½den"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mÄ›sÃc"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr "ZaÄÃ¡tek provoznÃ doby"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr "Od jakÃ© hodiny povolovat pÅ™Ãstup k Internetu"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "KvÃ³ta na proxy"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr "KvÃ³ta dat pro proxy"
diff --git a/squid/locale/de/fusiondirectory.po b/squid/locale/de/fusiondirectory.po
index 67395104bf23b510df3a76f79b5f03bccd178e85..a5a34a9b46e8a825518cb74a6baafbff84d114a7 100644
--- a/squid/locale/de/fusiondirectory.po
+++ b/squid/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +32,9 @@ msgstr "Proxy Konto"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Filtern von unerwÃ¼nschten Inhalten (z.B. pornografische oder gewalttÃ¤tige Inhalte)"
+msgstr ""
+"Filtern von unerwÃ¼nschten Inhalten (z.B. pornografische oder gewalttÃ¤tige "
+"Inhalte)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -43,7 +45,7 @@ msgid "Working Start"
 msgstr "Arbeitsstart"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "StundeStart"
 
@@ -51,68 +53,68 @@ msgstr "StundeStart"
 msgid "MinuteStart"
 msgstr "MinuteStart"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Inhaltsfilterung nur wÃ¤hrend der Arbeitszeit"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Arbeitsstopp"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr "MinuteStopp"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Proxynutzung durch Kontingent einschrÃ¤nken"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Auf"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "pro"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "Stunde"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "Tag"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "Woche"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "Monat"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr "Start-Stunden fÃ¼r Internetzugriff"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "Proxy Quota"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr "Maximale Datenquota fÃ¼r den Proxy"
diff --git a/squid/locale/el_GR/fusiondirectory.po b/squid/locale/el_GR/fusiondirectory.po
index b8fe50537931e10b3ac4d6594bd1707c03b8d20f..07e3f3c5b49fd7cd21b421856ff054c61aca84cb 100644
--- a/squid/locale/el_GR/fusiondirectory.po
+++ b/squid/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,9 @@ msgstr "Î”Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®Ï‚"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Î‘Ï…Ï„ÏŒ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Î²Î±ÏƒÎ¹ÎºÏŽÎ½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï„Î¿Ï… squid ÏƒÏ„Î¿ ldap Î³Î¹Î± ÎºÎ¬Î¸Îµ Ï‡ÏÎ®ÏƒÏ„Î·"
+msgstr ""
+"Î‘Ï…Ï„ÏŒ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Î²Î±ÏƒÎ¹ÎºÏŽÎ½ ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ‰Î½ Ï„Î¿Ï… squid ÏƒÏ„Î¿ ldap Î³Î¹Î± ÎºÎ¬Î¸Îµ "
+"Ï‡ÏÎ®ÏƒÏ„Î·"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -32,7 +34,9 @@ msgstr "Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Î¦Î¹Î»Ï„ÏÎ¬ÏÎ¹ÏƒÎ¼Î± Î±Î½ÎµÏ€Î¹Î¸ÏÎ¼Î·Ï„Î¿Ï… Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï… (Ï€.Ï‡. Ï€Î¿ÏÎ½Î¿Î³ÏÎ±Ï†Î¹ÎºÏŒ Î® Î²Î¹Î±Î¯Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿)"
+msgstr ""
+"Î¦Î¹Î»Ï„ÏÎ¬ÏÎ¹ÏƒÎ¼Î± Î±Î½ÎµÏ€Î¹Î¸ÏÎ¼Î·Ï„Î¿Ï… Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï… (Ï€.Ï‡. Ï€Î¿ÏÎ½Î¿Î³ÏÎ±Ï†Î¹ÎºÏŒ Î® Î²Î¹Î±Î¯Î¿ "
+"Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -43,7 +47,7 @@ msgid "Working Start"
 msgstr "ÎˆÎ½Î±ÏÎ¾Î· ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "ÎÏÎ± ÎµÎ½Î±ÏÎ¾Î·Ï‚"
 
@@ -51,68 +55,68 @@ msgstr "ÎÏÎ± ÎµÎ½Î±ÏÎ¾Î·Ï‚"
 msgid "MinuteStart"
 msgstr "Î›ÎµÏ€Ï„ÏŒ ÎÎ½Î±ÏÎ¾Î·Ï‚"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÏ„Î¿ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® ÏƒÎµ ÎµÏÎ³Î¬ÏƒÎ¹Î¼Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Î¤ÎÎ»Î¿Ï‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr "Î›ÎµÏ€Ï„ÏŒ Ï„ÎÎ»Î¿Ï…Ï‚"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÏŒÏ‚ Ï‡ÏÎ®ÏƒÎ·Ï‚ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î® Î±Î½Î¬ ÏŒÏÎ¹Î¿"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Î Î¬Î½Ï‰"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "Î±Î½Î¬"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "ÏŽÏÎ±"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "Î·Î¼ÎÏÎ±"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "ÎµÎ²Î´Î¿Î¼Î¬Î´Î±"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "Î¼Î®Î½Î±"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr "ÎˆÎ½Î±ÏÎ¾Î· ÎµÏÎ³Î¬ÏƒÎ¹Î¼Ï‰Î½ Ï‰ÏÏŽÎ½"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr "Î©ÏÎµÏ‚ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Î³Î¹Î± Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÏ„Î¿ Î´Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "ÎŒÏÎ¹Î± Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr "ÎœÎÎ³Î¹ÏƒÏ„Î± ÏŒÏÎ¹Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Î³Î¹Î± Ï„Î¿Î½ Î´Î¹Î±Î¼ÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®"
diff --git a/squid/locale/en/fusiondirectory.po b/squid/locale/en/fusiondirectory.po
index 937ba0e8d54e533d19dd8c31f9998d9dce7791f2..24c6fee90129570f2eef37f948f0a8e16e848a7b 100644
--- a/squid/locale/en/fusiondirectory.po
+++ b/squid/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/es/fusiondirectory.po b/squid/locale/es/fusiondirectory.po
index 64c0cef93f6f596ae44d70ca88e7b82ddf8d0180..4664139537706354c3771836f30b1c1fc8731b87 100644
--- a/squid/locale/es/fusiondirectory.po
+++ b/squid/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,8 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Permite almacenar configuraciones bÃ¡sicas de squid para cada usuario en ldap"
+msgstr ""
+"Permite almacenar configuraciones bÃ¡sicas de squid para cada usuario en ldap"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -42,7 +44,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +52,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Restringir uso del proxy a horario laboral"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir uso del proxy por cuotas"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Arriba"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "por cada"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "hora"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "dia"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "semana"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mes"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/es_CO/fusiondirectory.po b/squid/locale/es_CO/fusiondirectory.po
index ed23e27da48974c3bafe0eb534c0f10a42a113cb..dfbfdb16dafd4ab4bcc2111b059f3ca74e1c064b 100644
--- a/squid/locale/es_CO/fusiondirectory.po
+++ b/squid/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Arriba"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/es_VE/fusiondirectory.po b/squid/locale/es_VE/fusiondirectory.po
index 4dcabeffb6190abb793531b8dd9a3b905213ca71..4ce3c6da01fd1e57f916dfbdee0e0a6c0d23248f 100644
--- a/squid/locale/es_VE/fusiondirectory.po
+++ b/squid/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,8 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Permite almacenar configuraciones bÃ¡sicas de squid para cada usuario en ldap"
+msgstr ""
+"Permite almacenar configuraciones bÃ¡sicas de squid para cada usuario en ldap"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -42,7 +44,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +52,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Restringir uso del proxy a horario laboral"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir uso del proxy por cuotas"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Arriba"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "por cada"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "hora"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "dia"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "semana"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mes"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/fa_IR/fusiondirectory.po b/squid/locale/fa_IR/fusiondirectory.po
index 850417dd8684959693f3deab6c359bb1889dac57..6d594fbbd244302b519538b7c7a5d99d4311ba5c 100644
--- a/squid/locale/fa_IR/fusiondirectory.po
+++ b/squid/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/fi_FI/fusiondirectory.po b/squid/locale/fi_FI/fusiondirectory.po
index 89eb3cca7eea49e57fc9cc8917a5ef21ebef9c29..6dcd46a57c276f742c8841464fe0ce3ca909a41e 100644
--- a/squid/locale/fi_FI/fusiondirectory.po
+++ b/squid/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/fr/fusiondirectory.po b/squid/locale/fr/fusiondirectory.po
index ca21132de7e855504084fe872805b1c3f24aa108..d010ae1d902dc542d3463fc13b2f0c42a34e454f 100644
--- a/squid/locale/fr/fusiondirectory.po
+++ b/squid/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Permet de stocker les paramÃ¨tres basique de squid dans lâ€™annuaire LDAP pour chaque utilisateur"
+msgstr "Cette extension stocke les paramÃ¨tres squid dans votre annuaire"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -36,14 +36,14 @@ msgstr "Filtrer le contenu non dÃ©sirÃ© (i.e. pornographique ou violent)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
-msgstr "filterF"
+msgstr "Filtrer le contenu non dÃ©sirÃ©"
 
 #: personal/squid/class_proxyAccount.inc:97
 msgid "Working Start"
-msgstr "DÃ©but des heures de bureau"
+msgstr "AccÃ¨s au proxy autorisÃ© durant la plage horaire suivante"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "Heure de dÃ©part"
 
@@ -51,68 +51,68 @@ msgstr "Heure de dÃ©part"
 msgid "MinuteStart"
 msgstr "Minute de dÃ©part"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
-msgstr "Limiter lâ€™accÃ¨s au proxy aux heures de bureau"
+msgstr "AccÃ¨s au proxy autorisÃ© durant la plage horaire suivante"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
-msgstr "Fin des heures de bureau"
+msgstr "Cesser de fonctionner"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
-msgstr "Minute de fin"
+msgstr "Minute d'arrÃªt"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
-msgstr "Restreindre lâ€™utilisation du proxy par quota"
+msgstr "Restreindre la quantitÃ© de donnÃ©es tÃ©lÃ©chargeables par quota"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Au dessus"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "par"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "heure"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "jour"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "semaine"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mois"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
-msgstr "Heures de bureau"
+msgstr "Horaire de dÃ©but d'accÃ¨s"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
-msgstr "Limiter lâ€™accÃ¨s au proxy aux heures de bureau"
+msgstr "Horaire de dÃ©but d'accÃ¨s"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "Quota"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
-msgstr "Quota de donnÃ©es maximum du proxy"
+msgstr "Quota maximum"
diff --git a/squid/locale/hu_HU/fusiondirectory.po b/squid/locale/hu_HU/fusiondirectory.po
index 319a8cd57eb8094600bad43c90a8846655bb765f..4110fb5ec440771a72be655f00e11c94cb67e579 100644
--- a/squid/locale/hu_HU/fusiondirectory.po
+++ b/squid/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/id/fusiondirectory.po b/squid/locale/id/fusiondirectory.po
index 9445201b2dc79080daa19a13abb13f2ffb1e8957..9edd346648d5343adf0363e20b9f33d5bdb04cdb 100644
--- a/squid/locale/id/fusiondirectory.po
+++ b/squid/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/it_IT/fusiondirectory.po b/squid/locale/it_IT/fusiondirectory.po
index 50556316d0a4065228e23a995009b90fe8055301..ca91be53aa0a8ab18318415943f90cb5d2520caf 100644
--- a/squid/locale/it_IT/fusiondirectory.po
+++ b/squid/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:28+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +24,9 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Questo permette di memorizzare le impostazioni di base di squid nell'annuario ldap per ogni utente"
+msgstr ""
+"Questo permette di memorizzare le impostazioni di base di squid "
+"nell'annuario ldap per ogni utente"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -45,7 +45,7 @@ msgid "Working Start"
 msgstr "Avvio orario lavoro"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "Ora d'avvio"
 
@@ -53,68 +53,69 @@ msgstr "Ora d'avvio"
 msgid "MinuteStart"
 msgstr "Minuto d'avvio"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Accesso al proxy autorizzato durante la fascia oraria seguente"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Fine orario lavoro"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr "Minuto di fine"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
-msgstr "Restringi la quantitÃ  di dati scaricabili via il proxy impostando una quota"
+msgstr ""
+"Restringi la quantitÃ  di dati scaricabili via il proxy impostando una quota"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Sopra"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "per"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "ora"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "giorno"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "settimana"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mese"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr "Inizio orario di lavoro"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr "Inizio orari di accesso ad Internet"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "Quota per il proxy"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr "Dati quota massima per il proxy"
diff --git a/squid/locale/lv/fusiondirectory.po b/squid/locale/lv/fusiondirectory.po
index f7784ec40e395ffc44910c1f3f8c6e5316f7eb07..2beb1f7d1e6bd092a2a108e9acd249c0475fed21 100644
--- a/squid/locale/lv/fusiondirectory.po
+++ b/squid/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/nb/fusiondirectory.po b/squid/locale/nb/fusiondirectory.po
index 75837c291f00749633269a0b4e0a6de6ed778916..d99ba09768ee053d28d5b0550ea30e492c527f7a 100644
--- a/squid/locale/nb/fusiondirectory.po
+++ b/squid/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/nl/fusiondirectory.po b/squid/locale/nl/fusiondirectory.po
index bfa5011080a811217044eeb1f7e83d9265ecb133..0a9a955aa38b8019337f4f326cb2e0d868f5ddd3 100644
--- a/squid/locale/nl/fusiondirectory.po
+++ b/squid/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,8 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Dit staat toe om basis squid opties op te slaan in ldap voor elke gebruiker"
+msgstr ""
+"Dit staat toe om basis squid opties op te slaan in ldap voor elke gebruiker"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -31,7 +33,9 @@ msgstr "Proxy account"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Filter ongewilde inhoud (bijvoorbeeld pornografische of geweld gerelateerde inhoud)"
+msgstr ""
+"Filter ongewilde inhoud (bijvoorbeeld pornografische of geweld gerelateerde "
+"inhoud)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -42,7 +46,7 @@ msgid "Working Start"
 msgstr "Werkende Start"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "UurStart"
 
@@ -50,68 +54,68 @@ msgstr "UurStart"
 msgid "MinuteStart"
 msgstr "MinuutStart"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Beperk proxy gebruik tot tijd"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Werkende Stop"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr "MinuutStop"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Beperk proxy gebruik met quota"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Omhoog"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "per"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "uur"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "dag"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "week"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "maand"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
-msgstr ""
+msgstr "Begin van de werkuren"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/pl/fusiondirectory.po b/squid/locale/pl/fusiondirectory.po
index f7b36f2ac5c268d06c288226e018820417ce2f7a..c04300a8a4a69319a53b35c454067ee11e2ebd01 100644
--- a/squid/locale/pl/fusiondirectory.po
+++ b/squid/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Ogranicz dostÄ™p do proxy do czasu pracu"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Ogranicz uÅ¼ycie proxy mechanizmami quota"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "GÃ³ra"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "na"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "godzina"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "dzieÅ„"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "tydzieÅ„"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "miesiÄ…c"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/pt/fusiondirectory.po b/squid/locale/pt/fusiondirectory.po
index 2dfa8cf9251172f330a3d876521cd43e658ff4e2..6317ed2ade7b44271839220d657ba887bfdc889f 100644
--- a/squid/locale/pt/fusiondirectory.po
+++ b/squid/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Para cima"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/pt_BR/fusiondirectory.po b/squid/locale/pt_BR/fusiondirectory.po
index d4fdd1e303afab7db57d4b8318f5338905e64bb0..80492dcfb69f1c4dcc6d17844674fa0fba3f96a2 100644
--- a/squid/locale/pt_BR/fusiondirectory.po
+++ b/squid/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,9 @@ msgstr "Proxy"
 
 #: personal/squid/class_proxyAccount.inc:66
 msgid "This allow to store basic squid settings in ldap for each user"
-msgstr "Isto permite armazenar configuraÃ§Ãµes bÃ¡sicas do squid no ldap para cada usuÃ¡rio"
+msgstr ""
+"Isto permite armazenar configuraÃ§Ãµes bÃ¡sicas do squid no ldap para cada "
+"usuÃ¡rio"
 
 #: personal/squid/class_proxyAccount.inc:84
 msgid "Proxy account"
@@ -42,7 +45,7 @@ msgid "Working Start"
 msgstr "Comece a trabalhar"
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr "Hora de inÃcio"
 
@@ -50,68 +53,68 @@ msgstr "Hora de inÃcio"
 msgid "MinuteStart"
 msgstr "Minuto de inicil"
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "Limite de acesso para o tempo de trabalho do proxy"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr "Parar o trabalho"
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr "Minuto de parada"
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir o uso de proxy por quota"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Subir"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "per"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "hora"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "dia"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "semana"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "mÃªs"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr "Comece Jornada de Trabalho"
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr "ComeÃ§ando horas para acesso Ã  internet"
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr "Quota do proxy"
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr "Quota de Dados mÃ¡xima para o proxy"
diff --git a/squid/locale/ru/fusiondirectory.po b/squid/locale/ru/fusiondirectory.po
index f02270875e4738f5522e73f84e3bbe955be2ffc7..bf3ac37cadb7c2155967d4316f506ecc1de5c15c 100644
--- a/squid/locale/ru/fusiondirectory.po
+++ b/squid/locale/ru/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +32,9 @@ msgstr "ÐÐºÐºÐ°ÑƒÐ½Ñ‚ Proxy"
 
 #: personal/squid/class_proxyAccount.inc:90
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÐ¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ (Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ð¿Ð¾Ñ€Ð½Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ Ð¸Ð»Ð¸ ÑÐ²ÑÐ·Ð°Ð½Ð½Ð¾Ðµ Ñ Ð½Ð°ÑÐ¸Ð»Ð¸ÐµÐ¼)"
+msgstr ""
+"Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð½ÐµÐ¶ÐµÐ»Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ (Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ð¿Ð¾Ñ€Ð½Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑÐºÐ¾Ðµ Ð¸Ð»Ð¸ "
+"ÑÐ²ÑÐ·Ð°Ð½Ð½Ð¾Ðµ Ñ Ð½Ð°ÑÐ¸Ð»Ð¸ÐµÐ¼)"
 
 #: personal/squid/class_proxyAccount.inc:91
 msgid "filterF"
@@ -43,7 +45,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -51,68 +53,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ñ€Ð¾ÐºÑÐ¸ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ð¼ Ð²Ñ€ÐµÐ¼ÐµÐ½ÐµÐ¼"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr "-"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ":"
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡Ð¸Ñ‚ÑŒ ÐºÐ²Ð¾Ñ‚Ð¾Ð¹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€Ð¾ÐºÑÐ¸"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "ÐŸÐ¾ ÑƒÐ±Ñ‹Ð²Ð°Ð½Ð¸ÑŽ"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "per"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "Ñ‡Ð°Ñ"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "Ð´ÐµÐ½ÑŒ"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "Ð½ÐµÐ´ÐµÐ»Ñ"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "Ð¼ÐµÑÑÑ†"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/ru@petr1708/fusiondirectory.po b/squid/locale/ru@petr1708/fusiondirectory.po
index 5faca288d259ab658b3232772078445d50b007fb..9c6cc68be0673341f162f3b882d44a294acd1811 100644
--- a/squid/locale/ru@petr1708/fusiondirectory.po
+++ b/squid/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/sv/fusiondirectory.po b/squid/locale/sv/fusiondirectory.po
index e38dcaff189643c072c9688bdf2036b76ce747ea..e56479b74adc67795dea39e220a8099d367b0879 100644
--- a/squid/locale/sv/fusiondirectory.po
+++ b/squid/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "Upp"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/ug/fusiondirectory.po b/squid/locale/ug/fusiondirectory.po
index 83ff4b5be603952f544ae25d1767d716c276648d..81baa40314dc434958c31ac7f9ee623cb50a6d72 100644
--- a/squid/locale/ug/fusiondirectory.po
+++ b/squid/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +42,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +50,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/vi_VN/fusiondirectory.po b/squid/locale/vi_VN/fusiondirectory.po
index 86e0f1791ab2a0357207b2b5cdef08318293d983..a6b587d03ba28d95487b139182b10d03da8936ad 100644
--- a/squid/locale/vi_VN/fusiondirectory.po
+++ b/squid/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "LÃªn"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/locale/zh/fusiondirectory.po b/squid/locale/zh/fusiondirectory.po
index 0833b7a33aa0e39b26821940c685403f3566776a..aecbf1d63a3ab41c4535f3a4a307d6d9d252c13b 100644
--- a/squid/locale/zh/fusiondirectory.po
+++ b/squid/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgid "Working Start"
 msgstr ""
 
 #: personal/squid/class_proxyAccount.inc:100
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "HourStart"
 msgstr ""
 
@@ -50,68 +51,68 @@ msgstr ""
 msgid "MinuteStart"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:106
+#: personal/squid/class_proxyAccount.inc:109
 msgid "Limit proxy access to working time"
 msgstr "é™åˆ¶ä»£ç†è®¿é—®ä»…åœ¨å·¥ä½œæ—¶é—´"
 
-#: personal/squid/class_proxyAccount.inc:109
+#: personal/squid/class_proxyAccount.inc:112
 msgid "Working Stop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:112
+#: personal/squid/class_proxyAccount.inc:115
 msgid "-"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid ":"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:113
+#: personal/squid/class_proxyAccount.inc:116
 msgid "MinuteStop"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:119
-#: personal/squid/class_proxyAccount.inc:128
+#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:132
 msgid "Restrict proxy usage by quota"
 msgstr "é€šè¿‡ quota é™åˆ¶ä»£ç†ä½¿ç”¨"
 
-#: personal/squid/class_proxyAccount.inc:122
+#: personal/squid/class_proxyAccount.inc:125
 msgid "Up"
 msgstr "ä¸Š"
 
-#: personal/squid/class_proxyAccount.inc:131
-#: personal/squid/class_proxyAccount.inc:132
+#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:136
 msgid "per"
 msgstr "æ¯"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "hour"
 msgstr "å°æ—¶"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "day"
 msgstr "å¤©"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "week"
 msgstr "å‘¨"
 
-#: personal/squid/class_proxyAccount.inc:135
+#: personal/squid/class_proxyAccount.inc:139
 msgid "month"
 msgstr "æœˆ"
 
-#: personal/squid/class_proxyAccount.inc:138
+#: personal/squid/class_proxyAccount.inc:142
 msgid "Start Working Hours"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:139
+#: personal/squid/class_proxyAccount.inc:143
 msgid "Starting hours for internet access"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:146
+#: personal/squid/class_proxyAccount.inc:151
 msgid "Proxy Quota"
 msgstr ""
 
-#: personal/squid/class_proxyAccount.inc:147
+#: personal/squid/class_proxyAccount.inc:152
 msgid "Max Data quota for the proxy"
 msgstr ""
diff --git a/squid/personal/squid/class_proxyAccount.inc b/squid/personal/squid/class_proxyAccount.inc
index a7d129b3ab9dea1c0a52662099693b6b2cddbc73..0819a3138a95882ebb4b927d13d5a77c7bff0913 100644
--- a/squid/personal/squid/class_proxyAccount.inc
+++ b/squid/personal/squid/class_proxyAccount.inc
@@ -100,8 +100,11 @@ class proxyAccount extends simplePlugin
               new SelectAttribute ( '',  _('HourStart'),   'hourstart',   TRUE, array(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24), 1, array('01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24')),
               new SelectAttribute ( ':', _('MinuteStart'), 'minutestart', TRUE, array('00','15','30','45'))
             ),
+            // read format (not used)
             '',
+            // write format (not used)
             '',
+            // acl
             '',
             _('Limit proxy access to working time')
           ),
@@ -124,6 +127,7 @@ class proxyAccount extends simplePlugin
             ),
             '/^(\\d+)(.)$/',
             '%d%s',
+             // acl
             '',
             _('Restrict proxy usage by quota')
           ),
@@ -140,6 +144,7 @@ class proxyAccount extends simplePlugin
             'enableWorkingTime',
             FALSE,
             FALSE,
+            // acl
             'gosaProxyWorkingStart'
           ),
           new BooleanAttribute (
@@ -148,6 +153,7 @@ class proxyAccount extends simplePlugin
             'enableQuota',
             FALSE,
             FALSE,
+             // acl
             'gosaProxyQuota'
           )
         )
diff --git a/ssh/locale/ar/fusiondirectory.po b/ssh/locale/ar/fusiondirectory.po
index 5fc781f7151e8636bafce06eb5b9f654ee8273e8..d5acb67b858ba5338f66539d96bcd82c08b3f04e 100644
--- a/ssh/locale/ar/fusiondirectory.po
+++ b/ssh/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Ø®Ø·Ø£ Ø£Ø«Ù†Ø§Ø¡ Ø§Ù„Ø±ÙØ¹"
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "Ù…ÙØ§ØªÙŠØ Ø§Ù„Ù‚Ø´Ø±Ø© Ø§Ù„Ø¢Ù…Ù†Ø©"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "Ù‚Ø´Ø±Ø© Ø¢Ù…Ù†Ø©"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 d352290a1159306a99174d1daefc2ba3048b2025..466da30b26834ee9e0583e4d8d21efe663986e59 100644
--- a/ssh/locale/ca/fusiondirectory.po
+++ b/ssh/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 fc17f550252cdffc651bc8fc11f347e0575406e5..c3e3b590a03202bf9bb80c5563a4cf684bd63ac2 100644
--- a/ssh/locale/cs_CZ/fusiondirectory.po
+++ b/ssh/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,29 +20,29 @@ msgstr ""
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Upload error"
-msgstr "Chyba pÅ™i nahrÃ¡vÃ¡nÃ na protÄ›jÅ¡ek"
+msgstr "chyba pÅ™i nahrÃ¡vÃ¡nÃ"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Unknown public key format!"
 msgstr "NeznÃ¡mÃ½ formÃ¡t dat veÅ™ejnÃ© ÄÃ¡sti klÃÄe!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "SSH klÃÄe"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "VeÅ™ejnÃ© ÄÃ¡sti SSH klÃÄÅ¯ tohoto uÅ¾ivatele"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Upravit veÅ™ejnÃ© ÄÃ¡sti SSH klÃÄÅ¯ tohoto uÅ¾ivatele"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 8f5568f107ab682200d6ce4f5082409bcbe12741..ff3d5590b5c7eb0e62a07074868cff4e36a6c55c 100644
--- a/ssh/locale/de/fusiondirectory.po
+++ b/ssh/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Ãœbertragung fehlgeschlagen!"
 msgid "Unknown public key format!"
 msgstr "Unbekanntes Format fÃ¼r Ã¶ffentliche SchlÃ¼ssel!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "SSH SchlÃ¼ssel"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "Ã–ffentliche SSH-SchlÃ¼ssel fÃ¼r diesen Benutzer"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Die Ã¶ffentlichen SchlÃ¼ssel dieses Benutzers bearbeiten"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 0fbff55e5d5055041cfd82d867b18aa0f76fb108..0c63be04d7bb1ea60161dc443b8d3975256e854b 100644
--- a/ssh/locale/el_GR/fusiondirectory.po
+++ b/ssh/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,23 +26,23 @@ msgstr "Î£Ï†Î¬Î»Î¼Î± Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 msgid "Unknown public key format!"
 msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î· Î¼Î¿ÏÏ†Î® Î´Î·Î¼ÏŒÏƒÎ¹Î¿Ï… ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "ÎšÎ»ÎµÎ¹Î´Î¹Î¬ SSH"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "Î”Î·Î¼ÏŒÏƒÎ¹Î± ÎºÎ»ÎµÎ¹Î´Î¹Î¬ SSH Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Î´Î·Î¼ÏŒÏƒÎ¹Ï‰Î½ ÎºÎ»ÎµÎ¹Î´Î¹ÏŽÎ½ SSH Ï‡ÏÎ®ÏƒÏ„Î·"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 60855f9b083c79d5adf105212c45b04d0a352f01..0e55a3bc90bc64c86d43cf6177b4c9494ede8530 100644
--- a/ssh/locale/en/fusiondirectory.po
+++ b/ssh/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 fd58ecd27d7e9b8e005acd6711701ae1b5612ab7..196c1f8803e6c4a793a5a5da0c7ea025f46615b6 100644
--- a/ssh/locale/es/fusiondirectory.po
+++ b/ssh/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Error al subir"
 msgid "Unknown public key format!"
 msgstr "Formato de llave pÃºblica desconocido!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 198a99ae6bc5f1109774c6540b7c144a72b2c7e4..a7ffbeac747e9b15bc093ac9eace2aa42b07ae2b 100644
--- a/ssh/locale/es_CO/fusiondirectory.po
+++ b/ssh/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 1ed752260e56f0285ade7082ab94d217f2b5fd59..2c1548735cab125c93c22f4d63a13828c5023c24 100644
--- a/ssh/locale/es_VE/fusiondirectory.po
+++ b/ssh/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Error al subir"
 msgid "Unknown public key format!"
 msgstr "Formato de llave pÃºblica desconocido!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 6cf4abe4f7b51aeb5d3d5418b4270bb72042b2f5..b058d50bcc949f4452b8544a874886a86121965b 100644
--- a/ssh/locale/fa_IR/fusiondirectory.po
+++ b/ssh/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 4240eb350673ee7011b1e5d249d54cc85eeb4fbd..b7a066431902b2f832b81c0495bf6072073db388 100644
--- a/ssh/locale/fi_FI/fusiondirectory.po
+++ b/ssh/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 459c648b75598c2bcdbf84dc7d3b685e3ccd55af..bb62e6fd82357c751cc2b8aa78d381b1a5cd3de9 100644
--- a/ssh/locale/fr/fusiondirectory.po
+++ b/ssh/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,29 +20,29 @@ msgstr ""
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Upload error"
-msgstr "Erreur de tÃ©lÃ©versement"
+msgstr "Erreur de tÃ©lÃ©chargement"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Unknown public key format!"
-msgstr "Format de clef inconnuâ€¯!"
+msgstr "Format de la clef inconnue !"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "Clefs SSH"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
-msgstr "Clefs SSH publiques pour cet utilisateur"
+msgstr "Liste des clefs SSH publiques pour cet utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Editer les clefs SSH de l'utilisateur"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, php-format
 msgid "Error : there are several keys with fingerprint %s"
-msgstr "Erreurâ€¯: Il y a plusieurs clÃ©s avec l'empreinte %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 098f544a97cc7db51ac12acdd897da3d8e60899a..c3fd470105bc59d2a2e94a2df1fb0c7353339be5 100644
--- a/ssh/locale/hu_HU/fusiondirectory.po
+++ b/ssh/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 0aca1b106d3527b2f6d2b5c77b0dce227570ba82..b26fa7d0812050d849a91939a3a06a915ba3e96f 100644
--- a/ssh/locale/id/fusiondirectory.po
+++ b/ssh/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 59f5f359608815685fdc6a483509c24e81d56bec..d390b96b2e6c6200337229cf4c72a5505b6f4239 100644
--- a/ssh/locale/it_IT/fusiondirectory.po
+++ b/ssh/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 15:29+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,25 +24,25 @@ msgstr "Errore di caricamento"
 
 #: personal/ssh/class_sshAccount.inc:58
 msgid "Unknown public key format!"
-msgstr "Formato di chiave pubblica sconosciuto!"
+msgstr "Formato di chiave pubblica sconosciuto !"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "Chiavi SSH"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "Chiavi pubbliche SSH per questo utente"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Modifica le chiavi pubbliche SSH dell'utente"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 be5035670c611e49583e1a1aa4377a8cc8788433..754a3b1650ea3d682bfaddce270663dc76d21822 100644
--- a/ssh/locale/lv/fusiondirectory.po
+++ b/ssh/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 425eda063e1b76de573621ad8c7f4c84d0f2eb81..9f36d03cc1b3ae983ae08900aba97b195e5350a3 100644
--- a/ssh/locale/nb/fusiondirectory.po
+++ b/ssh/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 6cea526344eb18f1a03834aaa1b1e99f58f7e68b..71e3ada1c43d961beec236f9137d9779c6910d11 100644
--- a/ssh/locale/nl/fusiondirectory.po
+++ b/ssh/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Upload fout"
 msgid "Unknown public key format!"
 msgstr "Onbekende publieke sleutel formaat"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "SSH sleutels"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "SSH publieke sleutels voor deze gebruiker"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Wijzig de gebruiker zijn SSH publieke sleutels"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 19a807e483d291b1d8d944cd4a99e6ab9f4e7a79..66ab5bec93011bad7b9c63527a9617147e0dc137 100644
--- a/ssh/locale/pl/fusiondirectory.po
+++ b/ssh/locale/pl/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 9f92f3c137a89b5f615a95f63c113ebbb8b973df..89046b40f029e980b39e2774e6556e0c1c4bf134 100644
--- a/ssh/locale/pt/fusiondirectory.po
+++ b/ssh/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 f62e4f4e25b4afddf9bc9579b70cb84d3477a23f..34683dc49323afe4b7f6d1b0f1becfc8d9ffdaec 100644
--- a/ssh/locale/pt_BR/fusiondirectory.po
+++ b/ssh/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +26,23 @@ msgstr "Erro em upload"
 msgid "Unknown public key format!"
 msgstr "Formato de chave pÃºblica desconhecido!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr "Chaves SSH"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr "Chaves pÃºblicas de SSH para este usuÃ¡rio"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr "Editar chaves pÃºblicas do usuÃ¡rio"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 14962d9dace48e0841f5bf4e8d583eba94bf65e0..4d3541d084092f8d66b37d86a639a1a6138b7b23 100644
--- a/ssh/locale/ru/fusiondirectory.po
+++ b/ssh/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,23 +26,23 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 msgid "Unknown public key format!"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°!"
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
-msgstr "SSH ÐºÐ»ÑŽÑ‡Ð¸"
+msgstr "SSH ÐšÐ»ÑŽÑ‡Ð¸"
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
-msgstr "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ SSH ÐºÐ»ÑŽÑ‡Ð¸ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ SSH ÐºÐ»ÑŽÑ‡Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr "SSH"
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
-msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÐºÐ»ÑŽÑ‡Ð¸ SSH Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ SSH ÐºÐ»ÑŽÑ‡Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 404dcf1d05354658d57531558c7755c7fb5621dd..38c7768c96bb983ff2e7c8bf29a1c7c0f8687d2d 100644
--- a/ssh/locale/ru@petr1708/fusiondirectory.po
+++ b/ssh/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 206ca0b85b6d88819712ced0de0577eea8f65a1d..0db000c8e2a69c7b491372b69760097d6d602de6 100644
--- a/ssh/locale/sv/fusiondirectory.po
+++ b/ssh/locale/sv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 d3473075bf1ba048838942869f86007a94c6a56c..6077c6bc0a8c82e2a0bfb7eacab562d10eaaab1b 100644
--- a/ssh/locale/ug/fusiondirectory.po
+++ b/ssh/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 4467dff24163f33ff054591acf85c997073ab8c9..1ac0f46fdeeed5faa44a24f6d72a4916548b04d6 100644
--- a/ssh/locale/vi_VN/fusiondirectory.po
+++ b/ssh/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 b43492c4fbbb5ee2232574e29113a12f3cbc0bc4..33036078d204717b28ee27307398f72f8723a582 100644
--- a/ssh/locale/zh/fusiondirectory.po
+++ b/ssh/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,23 +25,23 @@ msgstr ""
 msgid "Unknown public key format!"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:80
+#: personal/ssh/class_sshAccount.inc:81
 msgid "SSH Keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:86
+#: personal/ssh/class_sshAccount.inc:87
 msgid "SSH public keys for this user"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:100
+#: personal/ssh/class_sshAccount.inc:104
 msgid "SSH"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:101
+#: personal/ssh/class_sshAccount.inc:105
 msgid "Edit user's SSH public keys"
 msgstr ""
 
-#: personal/ssh/class_sshAccount.inc:123
+#: personal/ssh/class_sshAccount.inc:127
 #, 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 f6334c748b3f6ec65c61ac4b3cec9a75c6107fba..a7de6b974e0cc28a74179cd732da256b8e1cc3f8 100644
--- a/ssh/personal/ssh/class_sshAccount.inc
+++ b/ssh/personal/ssh/class_sshAccount.inc
@@ -73,6 +73,7 @@ class sshAccount extends simplePlugin
   var $displayHeader = TRUE;
   var $objectclasses = array('ldapPublicKey');
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
@@ -86,8 +87,11 @@ class sshAccount extends simplePlugin
               '', _('SSH public keys for this user'),
               'sshPublicKey'
             ),
+            // no order
             FALSE,
-            array(), TRUE
+            array(),
+            // edit enabled
+            TRUE
           )
         )
       )
diff --git a/subcontracting/locale/ar/fusiondirectory.po b/subcontracting/locale/ar/fusiondirectory.po
index 2af7debe2036d18e3f3a9e58c7151b616e445c4a..c856e0bc2727caf7663258f2cbd0202c367e3c71 100644
--- a/subcontracting/locale/ar/fusiondirectory.po
+++ b/subcontracting/locale/ar/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ca/fusiondirectory.po b/subcontracting/locale/ca/fusiondirectory.po
index b3442280cb30ad17bd18af3703bcb538bcfb36a3..bb1527a74247431a5d30fb304c1f1f7446dd840f 100644
--- a/subcontracting/locale/ca/fusiondirectory.po
+++ b/subcontracting/locale/ca/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TelÃ¨fon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 9f38b8d525809955286d4f805712649380593e2c..a6504b767de1648f601e6b4986a0c63de5fff7ed 100644
--- a/subcontracting/locale/cs_CZ/fusiondirectory.po
+++ b/subcontracting/locale/cs_CZ/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
-msgstr "Telefon"
+msgstr "telefon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/de/fusiondirectory.po b/subcontracting/locale/de/fusiondirectory.po
index 7e1827a44d08ebb6f191f83d55938fd8f48966af..09b66ae9603aa528649592652fe42b3f075dfcad 100644
--- a/subcontracting/locale/de/fusiondirectory.po
+++ b/subcontracting/locale/de/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 d8164af3d141c32a19a8ed29497f7e398da22534..d14a22f29a2884ee5cf98bf2c1cdbc41ac988dec 100644
--- a/subcontracting/locale/el_GR/fusiondirectory.po
+++ b/subcontracting/locale/el_GR/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Î¤Î·Î»ÎÏ†Ï‰Î½Î¿"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/en/fusiondirectory.po b/subcontracting/locale/en/fusiondirectory.po
index 133470ef8fa74957c22c1731ab947b3981cee420..c41fa3e8de1cd15dbc5f8ecf77abcbace107b534 100644
--- a/subcontracting/locale/en/fusiondirectory.po
+++ b/subcontracting/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -17,54 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/es/fusiondirectory.po b/subcontracting/locale/es/fusiondirectory.po
index e35810e5354a0da18609cab040b054a8aabf6ce5..8646e3ea74dd9d962b90f30b6758616c8ef5d82d 100644
--- a/subcontracting/locale/es/fusiondirectory.po
+++ b/subcontracting/locale/es/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 7556c42609e5a3e32ea0708815b1dc817d05aff7..235a9ebceb72c4f5c1d81d28b5b8b74bad264675 100644
--- a/subcontracting/locale/es_CO/fusiondirectory.po
+++ b/subcontracting/locale/es_CO/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 4169297c8d45c9e2af5e19ed892df9fbdf006f78..70d7e8ad8db91047bd842d9b168fc80b68ea7790 100644
--- a/subcontracting/locale/es_VE/fusiondirectory.po
+++ b/subcontracting/locale/es_VE/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 6fc6e9f977087dd30ba303486022337b4e4ce6ab..c8c9262b3613f5ea5a6ca9faa01c866377f79c5e 100644
--- a/subcontracting/locale/fa_IR/fusiondirectory.po
+++ b/subcontracting/locale/fa_IR/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa_IR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "ØªÙ„ÙÙ†"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 98d34b12244768f9a8725ad20605a76e657e5cc0..452c3f3b1085dcfde3e56b1dd3c7a3c384e13b40 100644
--- a/subcontracting/locale/fi_FI/fusiondirectory.po
+++ b/subcontracting/locale/fi_FI/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Puhelin"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/fr/fusiondirectory.po b/subcontracting/locale/fr/fusiondirectory.po
index af5d89533e284d8cfbdf10d4e38dc877382f682b..c803177805146af94ea51cf79ca9dd53118bfd32 100644
--- a/subcontracting/locale/fr/fusiondirectory.po
+++ b/subcontracting/locale/fr/fusiondirectory.po
@@ -1,71 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr "Sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr "Information pour la sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr "Information de sous traitance"
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr "IntermÃ©diaire"
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr "Contact final chez le client"
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr "Client final"
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr "Contact final pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr "Adresse de messagerie"
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr "Adresse de courriel principale pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TÃ©lÃ©phone"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr "NumÃ©ro de tÃ©lÃ©phone pour cette mission"
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr "Adresse postale"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 2238f648f4ff37f20341a6a6c27735632ac2f320..9a98b37f731981c837092f1d39d548828cb1a6c8 100644
--- a/subcontracting/locale/hu_HU/fusiondirectory.po
+++ b/subcontracting/locale/hu_HU/fusiondirectory.po
@@ -1,70 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/id/fusiondirectory.po b/subcontracting/locale/id/fusiondirectory.po
index 069f367bd986b30ea7f957ac28746224d9f8fb9e..f8eb24c0f7f58278b2f66efc62aaa9dceb4cd5ff 100644
--- a/subcontracting/locale/id/fusiondirectory.po
+++ b/subcontracting/locale/id/fusiondirectory.po
@@ -1,70 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 1af8f28ab0fc75d2456d20f2f33005c82102beb9..0240226823b5c2447fd6193fe606d695df086e8d 100644
--- a/subcontracting/locale/it_IT/fusiondirectory.po
+++ b/subcontracting/locale/it_IT/fusiondirectory.po
@@ -1,73 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 14:39+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it_IT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr "Subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr "Informazioni necessarie per i contratti di subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr "Informazioni subappalto"
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr "INtermedio"
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr "Rivolgersi al cliente finale"
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr "Cliente finale"
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr "Cliente finale per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr "Indirizzo di posta elettronica"
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr "Indirizzo di posta elettronica assegnato per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefono"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr "NUmero di telefono assegnato per questa missione"
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 6bee7a4d9bcef0617ea01a26ef26afb4b39ce1ff..28773d133a8e141bcf4f12f2d20d723fd96b9362 100644
--- a/subcontracting/locale/lv/fusiondirectory.po
+++ b/subcontracting/locale/lv/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "TÄlrunis"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/nb/fusiondirectory.po b/subcontracting/locale/nb/fusiondirectory.po
index 128da832dd177d39f98f06eec774917e6d44e248..0e2e47aff0ce4f3a50833a34dfdcc5f9d57ce087 100644
--- a/subcontracting/locale/nb/fusiondirectory.po
+++ b/subcontracting/locale/nb/fusiondirectory.po
@@ -1,70 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/nl/fusiondirectory.po b/subcontracting/locale/nl/fusiondirectory.po
index 8bb09968b225ca025ec38b6b4217c78810cf2819..dc1bc8062ecd20d03c9db4e1db810772766f4163 100644
--- a/subcontracting/locale/nl/fusiondirectory.po
+++ b/subcontracting/locale/nl/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
-msgstr ""
+msgstr "E-mail adres"
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefoon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
-msgstr ""
+msgstr "Woonadres"
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/pl/fusiondirectory.po b/subcontracting/locale/pl/fusiondirectory.po
index e1e03c691f2196d28cebfa4f7c1824ef774365d0..90b6afcf26ac20db64ef6bb28445f70f14707b44 100644
--- a/subcontracting/locale/pl/fusiondirectory.po
+++ b/subcontracting/locale/pl/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/pt/fusiondirectory.po b/subcontracting/locale/pt/fusiondirectory.po
index e6530f2f674327035229d7ceff282c0ec14c18f3..820fdff589083fa94b728fa9a8df2b34a2db1a73 100644
--- a/subcontracting/locale/pt/fusiondirectory.po
+++ b/subcontracting/locale/pt/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Fone"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 949dc38c8c99862eb0c552402ef1241dff02c351..96a66cad2ae4f6280dbdcea7a16aa874909b9ee4 100644
--- a/subcontracting/locale/pt_BR/fusiondirectory.po
+++ b/subcontracting/locale/pt_BR/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefone"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ru/fusiondirectory.po b/subcontracting/locale/ru/fusiondirectory.po
index dfb181d1c7afdfc4163a6c7d2db3f119b699a071..98bb7e7479ff3524bafd49965cd49111f0751a82 100644
--- a/subcontracting/locale/ru/fusiondirectory.po
+++ b/subcontracting/locale/ru/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 81d6292ccfb93630633e89583fef1ac4693c23b6..50a953f212d3adfcae93fc7a7df6f88c99dde8c2 100644
--- a/subcontracting/locale/ru@petr1708/fusiondirectory.po
+++ b/subcontracting/locale/ru@petr1708/fusiondirectory.po
@@ -1,70 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/sv/fusiondirectory.po b/subcontracting/locale/sv/fusiondirectory.po
index 96fa559596ea58e48bf828b9ba1522ae76ce10f9..ee970b2966e1a8ab8ff5612e130d3a2d923fec57 100644
--- a/subcontracting/locale/sv/fusiondirectory.po
+++ b/subcontracting/locale/sv/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Telefon"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/ug/fusiondirectory.po b/subcontracting/locale/ug/fusiondirectory.po
index 531113aea532fe689d50c3a0f63e5063fb68aa6a..93a9205de72b68a05a73b4e392464dffb0a355f1 100644
--- a/subcontracting/locale/ug/fusiondirectory.po
+++ b/subcontracting/locale/ug/fusiondirectory.po
@@ -1,70 +1,70 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 ea29c1cf842d3410c764de0ab89c2acda2e07016..ffd34ebe6cbaa8eb50af41a77044a1b260d1cb57 100644
--- a/subcontracting/locale/vi_VN/fusiondirectory.po
+++ b/subcontracting/locale/vi_VN/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi_VN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 msgid "Address where this mission is executed"
 msgstr ""
diff --git a/subcontracting/locale/zh/fusiondirectory.po b/subcontracting/locale/zh/fusiondirectory.po
index dcb92ea2513fd7fa98d8f2e556921a0f9f83b9b9..70a52d676cf4eb454176754a921abf1a9abbd7fc 100644
--- a/subcontracting/locale/zh/fusiondirectory.po
+++ b/subcontracting/locale/zh/fusiondirectory.po
@@ -1,70 +1,71 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: personal/subcontracting/class_subContracting.inc:29
+#: personal/subcontracting/class_subContracting.inc:33
 msgid "Subcontracting"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:30
+#: personal/subcontracting/class_subContracting.inc:34
 msgid "Information needed for sub contracts"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:42
+#: personal/subcontracting/class_subContracting.inc:47
 msgid "SubContracting Information"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:45
+#: personal/subcontracting/class_subContracting.inc:50
 msgid "Intermediate"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:46
+#: personal/subcontracting/class_subContracting.inc:51
 msgid "Contact to the final customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:52
+#: personal/subcontracting/class_subContracting.inc:57
 msgid "Final Customer"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:53
+#: personal/subcontracting/class_subContracting.inc:58
 msgid "Final Customer for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:59
+#: personal/subcontracting/class_subContracting.inc:64
 msgid "Mail Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:60
+#: personal/subcontracting/class_subContracting.inc:65
 msgid "Mail address assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:66
+#: personal/subcontracting/class_subContracting.inc:71
 msgid "Phone"
 msgstr "ç”µè¯"
 
-#: personal/subcontracting/class_subContracting.inc:67
+#: personal/subcontracting/class_subContracting.inc:72
 msgid "Phone number assigned for this mission"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:73
+#: personal/subcontracting/class_subContracting.inc:78
 msgid "Street Address"
 msgstr ""
 
-#: personal/subcontracting/class_subContracting.inc:74
+#: personal/subcontracting/class_subContracting.inc:79
 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 604baaecd233c84d7da490a1bc235925ab0c21a4..309f66df760cfe2158c68db53e810db3fffde5b5 100644
--- a/subcontracting/personal/subcontracting/class_subContracting.inc
+++ b/subcontracting/personal/subcontracting/class_subContracting.inc
@@ -20,7 +20,11 @@
 
 class subContractingAccount extends simplePlugin
 {
+  // We set displayHeader to FALSE, because we don't want a header allowing to activate/deactivate this plugin,
+  // we want it activated on all objects
   var $displayHeader = TRUE;
+
+  // Here we indicate which LDAP classes our plugin is using.
   var $objectclasses = array('fdSubcontractingPerson');
 
   static function plInfo ()
@@ -35,6 +39,7 @@ class subContractingAccount extends simplePlugin
     );
   }
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
diff --git a/sudo/admin/sudo/class_sudoGeneric.inc b/sudo/admin/sudo/class_sudoGeneric.inc
index d97accdd32d41c0fb2d9bfe8c124d9cbcb932b79..aa91a753c9c1e3c3eb96e6a7c97fe6cc414b4826 100644
--- a/sudo/admin/sudo/class_sudoGeneric.inc
+++ b/sudo/admin/sudo/class_sudoGeneric.inc
@@ -131,6 +131,17 @@ class sudo extends simplePlugin
         'ou'        => get_ou('sudoRDN'),
         'tabClass'  => 'sudotabs',
       )),
+      'plForeignKeys'  => array(
+        'sudoUser'   => array(
+          array('user', 'uid', '(sudoUser=%oldvalue%)'),
+          array('posixGroup', 'cn', '(sudoUser=%|%%oldvalue%)'),
+        ),
+        'sudoHost'   => array(
+          array('serverGeneric', 'cn'),
+          array('workstationGeneric', 'cn'),
+          array('terminalGeneric', 'cn'),
+        ),
+      ),
 
       'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
@@ -233,6 +244,24 @@ class sudo extends simplePlugin
   {
     return preg_match("/^defaults$/i", $this->attributesAccess['cn']->getValue());
   }
+
+  function foreignKeyCheck ($field, $fieldvalue, $source)
+  {
+    if (($field == 'sudoUser') && ($source['CLASS'] == 'posixGroup')) {
+      return parent::foreignKeyCheck($field, '%'.$fieldvalue, $source);
+    } else {
+      return parent::foreignKeyCheck($field, $fieldvalue, $source);
+    }
+  }
+
+  function foreignKeyUpdate($field, $oldvalue, $newvalue, $source)
+  {
+    if (($field == 'sudoUser') && ($source['CLASS'] == 'posixGroup')) {
+      return parent::foreignKeyUpdate($field, '%'.$oldvalue, '%'.$newvalue, $source);
+    } else {
+      return parent::foreignKeyUpdate($field, $oldvalue, $newvalue, $source);
+    }
+  }
 }
 
 ?>
diff --git a/sudo/admin/sudo/class_sudoManagement.inc b/sudo/admin/sudo/class_sudoManagement.inc
index aff2611901eaa8a130603dd76f0d04eb11a52d37..a01b2ff7569c16a83374b1717ec51d0bcca8c09b 100644
--- a/sudo/admin/sudo/class_sudoManagement.inc
+++ b/sudo/admin/sudo/class_sudoManagement.inc
@@ -53,9 +53,9 @@ class sudoManagement extends simpleManagement
     );
   }
 
-  function newEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
+  function newEntry($action, array $target, array $all)
   {
-    $str = parent::newEntry('new_SUDO', $target, $all, $altTabClass, $altTabType, $altAclCategory);
+    $str = parent::newEntry('new_SUDO', $target, $all);
 
     /* This entry will become the default entry */
     if ($action == 'new_default') {
diff --git a/sudo/admin/sudo/class_sudoOption.inc b/sudo/admin/sudo/class_sudoOption.inc
index d0bafc533d64612475538eee677005c5c86df051..b12cb5056f2b13e98f697aedf4e841e244797b9c 100644
--- a/sudo/admin/sudo/class_sudoOption.inc
+++ b/sudo/admin/sudo/class_sudoOption.inc
@@ -19,11 +19,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/*
- * TODO
- * Find a way to translate descriptions
- */
-
 class UsedOptionAttribute extends CompositeAttribute
 {
   function __construct ($description, $ldapName, $acl = "")
@@ -391,7 +386,6 @@ class SudoOptionAttribute extends Attribute
     $smarty->assign("booleanOptions", array("FALSE","TRUE"));
     if ($this->type == "STRING") {
       $display = '<input type="text" name="'.$id.'" id="'.$id.'" value="'.$value.'" />';
-      /* FIXME : LIST must be handle in an other way */
     } elseif ($this->type == "LISTS") {
       $display = '<input type="text" name="'.$id.'" id="'.$id.'" value="'.$value.'" />';
     } elseif ($this->type == "INTEGER") {
@@ -473,9 +467,11 @@ class sudoOption extends simplePlugin
   var $displayHeader = FALSE;
   var $objectclasses = array();
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     return array(
+      // Attributes are grouped by section
       'available_options' => array(
         'name'  => _('Available options'),
         'attrs' => array(
diff --git a/sudo/locale/ar/fusiondirectory.po b/sudo/locale/ar/fusiondirectory.po
index c30ba4914d78a11dfea420643ace3ebf8720bcaa..fd1391a44714a2106f15906455d17f5044522d0f 100644
--- a/sudo/locale/ar/fusiondirectory.po
+++ b/sudo/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Ø¥Ø®ØªÙŠØ§Ø±"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Ø£Ù†Ø¸Ù…Ø©"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/ca/fusiondirectory.po b/sudo/locale/ca/fusiondirectory.po
index 771cf56b974a9b553913516c4967eba7b1b8d8ba..59ce5c7d97da33deb594a72762449374caf49b6e 100644
--- a/sudo/locale/ca/fusiondirectory.po
+++ b/sudo/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/cs_CZ/fusiondirectory.po b/sudo/locale/cs_CZ/fusiondirectory.po
index 169f4b4b53fa469d6e797f8112251708d717abfd..6a7222f4191910175948384e405c658fe9c9cad2 100644
--- a/sudo/locale/cs_CZ/fusiondirectory.po
+++ b/sudo/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,117 +41,120 @@ msgstr "VÄ›tev, ve kterÃ© budou uklÃ¡dÃ¡ni drÅ¾itelÃ© prÃ¡v sudo"
 
 #: admin/sudo/class_sudoManagement.inc:33
 msgid "Sudo management"
-msgstr "SprÃ¡va sudo"
+msgstr "sprÃ¡va sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
-msgstr "NeznÃ¡mÃ¡ pÅ™edvolba"
+msgstr "neznÃ¡mÃ½ parametr"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
-msgstr "PÅ™edvolba %s pro sudo nenÃ platnÃ¡!"
+msgstr "parametr '%s' pro sudo nenÃ platnÃ½!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
-msgstr "PÅ™edvolby k dispozici"
+msgstr "dostupnÃ© volby"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
-msgstr "PÅ™edvolba"
+msgstr "volba"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "PÅ™idat dalÅ¡Ã pÅ™edvolbu pro sudo"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "PouÅ¾itÃ© pÅ™edvolby role sudo"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
-msgstr "PÅ™edvolby"
+msgstr "volby"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
-msgstr "PÅ™edvolby sudo"
+msgstr "nastavenÃ sudo"
 
 #: admin/sudo/class_sudoGeneric.inc:124 admin/sudo/class_sudoGeneric.inc:128
 msgid "Sudo role"
-msgstr "Role v sudo"
+msgstr "role v sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr "NastavenÃ role"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "NÃ¡zev role"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "Popis pro novou roli sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
-msgstr "PÅ™Ãkazy"
+msgstr "pÅ™Ãkazy"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "UnixovÃ½ pÅ™Ãkaz s volitelnÃ½mi argumenty, pÅ™ÃpadnÄ› obsahujÃcÃ zÃ¡stupnÃ© znaky"
+msgstr ""
+"UnixovÃ½ pÅ™Ãkaz s volitelnÃ½mi argumenty, pÅ™ÃpadnÄ› obsahujÃcÃ zÃ¡stupnÃ© znaky"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr "Spustit jako (uÅ¾ivatel)"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr "UÅ¾ivatelÃ©, ztÄ›lesnÄ›nÃ v sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr "Spustit jako (skupina)"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr "Skupiny, ztÄ›lesnÄ›nÃ© prostÅ™ednictvÃm sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
-msgstr "SystÃ©my"
+msgstr "systÃ©my"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "NÃ¡zev poÄÃtaÄe, IP adresa nebo sÃÅ¥"
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
-msgstr "UÅ¾ivatelÃ© a skupiny"
+msgstr "uÅ¾ivatelÃ© a skupiny"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "UÅ¾ivatelskÃ© jmÃ©no, identifikÃ¡tor (pÅ™edeslanÃ½ znakem #), unixovÃ¡ skupiny (pÅ™edeslanÃ¡ znakem %)"
+msgstr ""
+"UÅ¾ivatelskÃ© jmÃ©no, identifikÃ¡tor (pÅ™edeslanÃ½ znakem #), unixovÃ¡ skupiny "
+"(pÅ™edeslanÃ¡ znakem %)"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
-msgstr "Priorita"
+msgstr "priorita"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr "PoÅ™adÃ pÅ™ednosti tohoto pravidla v porovnÃ¡nÃ s ostatnÃmi"
diff --git a/sudo/locale/de/fusiondirectory.po b/sudo/locale/de/fusiondirectory.po
index 69f32af441a8d1d5e319bcadc1b2278e01ecc788..faa700fac954462effb3069b0c1571730f9aee4d 100644
--- a/sudo/locale/de/fusiondirectory.po
+++ b/sudo/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,41 +43,41 @@ msgstr "Zweig in dem sudoers gespeichert werden wird"
 msgid "Sudo management"
 msgstr "SUDO-Verwaltung"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "Unbekannte Option"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "Die sudo-Option '%s' ist ungÃ¼ltig!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "VerfÃ¼gbare Optionen"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "Eine neue sudo-Option hinzufÃ¼gen"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "Benutzte sudo Rollenoptionen"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Optionen"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Sudo-Optionen"
 
@@ -85,73 +85,76 @@ msgstr "Sudo-Optionen"
 msgid "Sudo role"
 msgstr "Sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr "Rolleneinstellungen"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Name"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Name der Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "Beschreibung fÃ¼r die neue sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Kommandos"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "Ein Unix-Befehl mit optionalen Kommandozeilenargumenten, potentiell inklusive globbing-Zeichen (aka wild cards)"
+msgstr ""
+"Ein Unix-Befehl mit optionalen Kommandozeilenargumenten, potentiell "
+"inklusive globbing-Zeichen (aka wild cards)"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr "AusfÃ¼hren als (Benutzer)"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr "AusfÃ¼hren als (Gruppe)"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "Ein Hostname, IP Adresse oder IP-Netzwerk"
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Benutzer und Gruppen"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "Ein Benutzername, user ID (mit Prefix '#'), Unixgruppe (mit Prefix '#')"
+msgstr ""
+"Ein Benutzername, user ID (mit Prefix '#'), Unixgruppe (mit Prefix '#')"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "PrioritÃ¤t"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/el_GR/fusiondirectory.po b/sudo/locale/el_GR/fusiondirectory.po
index b2084116833da70c309fcb17fd694b6c84e32fde..31bd88ba14d7c0ab328f3a07af77306386d6f2c4 100644
--- a/sudo/locale/el_GR/fusiondirectory.po
+++ b/sudo/locale/el_GR/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,41 +43,41 @@ msgstr "ÎšÎ»Î¬Î´Î¿Ï‚ ÏƒÏ„Î¿Î½ Î¿Ï€Î¿Î¯Î¿ Î¸Î± Î±Ï€Î¿Î¸Î·ÎºÎµÏÎ¿Î½Ï„Î±Î¹ Î¿Î¹ su
 msgid "Sudo management"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î· ÎµÏ€Î¹Î»Î¿Î³Î®"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "Î— ÎµÏ€Î¹Î»Î¿Î³Î® sudo  '%s' ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ·!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Î”Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î®"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î½ÎÎ±Ï‚ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚ sudo"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½ÎµÏ‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚ ÏÏŒÎ»Î¿Ï… sudo"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
-msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚"
+msgstr " Î•Ï€Î¹Î»Î¿Î³ÎÏ‚"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Sudo"
 
@@ -87,73 +85,77 @@ msgstr "Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Sudo"
 msgid "Sudo role"
 msgstr "Î¡ÏŒÎ»Î¿Ï‚ Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÏÏŒÎ»Î¿Ï…"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "ÎŒÎ½Î¿Î¼Î± Ï„Î¿Ï… ÏÏŒÎ»Î¿Ï…"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… Î½ÎÎ¿Ï… ÏÏŒÎ»Î¿Ï… sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Î•Î½Ï„Î¿Î»ÎÏ‚"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "ÎœÎ¹Î± ÎµÎ½Ï„Î¿Î»Î® Unix Î¼Îµ Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎÏ‚ Ï€Î±ÏÎ±Î¼ÎÏ„ÏÎ¿Ï…Ï‚ Î³ÏÎ±Î¼Î¼Î®Ï‚ ÎµÎ½Ï„Î¿Î»ÏŽÎ½, Î¼Îµ Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î± ÏƒÏ…Î¼Ï€ÎµÏÎ¯Î»Î·ÏˆÎ·Ï‚ wild cards"
+msgstr ""
+"ÎœÎ¹Î± ÎµÎ½Ï„Î¿Î»Î® Unix Î¼Îµ Ï€ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÎÏ‚ Ï€Î±ÏÎ±Î¼ÎÏ„ÏÎ¿Ï…Ï‚ Î³ÏÎ±Î¼Î¼Î®Ï‚ ÎµÎ½Ï„Î¿Î»ÏŽÎ½, Î¼Îµ Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î± "
+"ÏƒÏ…Î¼Ï€ÎµÏÎ¯Î»Î·ÏˆÎ·Ï‚ wild cards"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï‰Ï‚ (Ï‡ÏÎ®ÏƒÏ„Î·Ï‚)"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚ impersonated Î±Ï€ÏŒ sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï‰Ï‚ (Î¿Î¼Î¬Î´Î±)"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr "ÎŸÎ¼Î¬Î´ÎµÏ‚ mpersonated Î±Ï€ÏŒ sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
-msgstr "Î£Ï…ÏƒÏ„Î®Î¼Î±Ï„Î± "
+msgstr "Systems"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®, Î¼Î¹Î± Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·  IP, Î® ÎÎ½Î± Î´Î¯ÎºÏ„Ï…Î¿ IP "
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚ ÎºÎ±Î¹ Î¿Î¼Î¬Î´ÎµÏ‚"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·, Ï„Î±Ï…Ï„ÏŒÏ„Î·Ï„Î± Ï‡ÏÎ®ÏƒÏ„Î· (ID Î¼Îµ Ï€ÏÏŒÎ¸ÎµÎ¼Î± '#'), Î¿Î¼Î¬Î´Î± (Unix group Î¼Îµ Ï€ÏÏŒÎ¸ÎµÎ¼Î± '%')"
+msgstr ""
+"ÎˆÎ½Î± ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·, Ï„Î±Ï…Ï„ÏŒÏ„Î·Ï„Î± Ï‡ÏÎ®ÏƒÏ„Î· (ID Î¼Îµ Ï€ÏÏŒÎ¸ÎµÎ¼Î± '#'), Î¿Î¼Î¬Î´Î± (Unix group Î¼Îµ"
+" Ï€ÏÏŒÎ¸ÎµÎ¼Î± '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Î ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr "Î£Ï…ÏƒÏ‡ÎÏ„Î¹ÏƒÎ· Ï„Î·Ï‚ Ï€ÏÎ¿Ï„ÎµÏÎ±Î¹ÏŒÏ„Î·Ï„Î±Ï‚ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÏÏŒÎ»Î¿Ï… Î¼Îµ Î¬Î»Î»Ï‰Î½."
diff --git a/sudo/locale/en/fusiondirectory.po b/sudo/locale/en/fusiondirectory.po
index 7a85c365ed96cbae46406a449f3a8315054a8f1c..88af1255a1765f235f0cc40cb2b4bb54905d6d42 100644
--- a/sudo/locale/en/fusiondirectory.po
+++ b/sudo/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -42,41 +42,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +84,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/es/fusiondirectory.po b/sudo/locale/es/fusiondirectory.po
index e0274ca6a12badbb3e4fde87468220f3e57caabf..7287b7123fb1eb29ceae429d4f0158967d0a652a 100644
--- a/sudo/locale/es/fusiondirectory.po
+++ b/sudo/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr "AdministraciÃ³n Sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "OpciÃ³n desconocida"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "Â¡La opciÃ³n Sudo %s no es vÃ¡lida!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "OpciÃ³n"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
@@ -84,73 +85,73 @@ msgstr "Opciones Sudo"
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/es_CO/fusiondirectory.po b/sudo/locale/es_CO/fusiondirectory.po
index 10a8be2107fa3a3d2886268c3f6245df7b65be9d..528936c20599060cff98f9e38564cb00c818497a 100644
--- a/sudo/locale/es_CO/fusiondirectory.po
+++ b/sudo/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Nombre del Rol"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Usuarios y Grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/es_VE/fusiondirectory.po b/sudo/locale/es_VE/fusiondirectory.po
index 4d372f640103b55edcb62ba039fa757c04f1361f..7c5bac3e0cc18c8fad4a4e0975a05ca649549c1d 100644
--- a/sudo/locale/es_VE/fusiondirectory.po
+++ b/sudo/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr "AdministraciÃ³n Sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "OpciÃ³n desconocida"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "Â¡La opciÃ³n Sudo %s no es vÃ¡lida!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Opciones disponibles"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "OpciÃ³n"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Opciones"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Opciones Sudo"
 
@@ -84,73 +85,73 @@ msgstr "Opciones Sudo"
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Usuarios y grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Prioridad"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/fa_IR/fusiondirectory.po b/sudo/locale/fa_IR/fusiondirectory.po
index 172f4db21462a4a504d52029c81e9b23a00700a4..6701eeec8a686b8ab46da9cd44256e1ab9e5cf0c 100644
--- a/sudo/locale/fa_IR/fusiondirectory.po
+++ b/sudo/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +42,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +84,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/fi_FI/fusiondirectory.po b/sudo/locale/fi_FI/fusiondirectory.po
index b9cb29e09ac532dd3cf87498b46c1425eb0871c0..b5b06e52a0d69ea2095f2259ce831085810bccdf 100644
--- a/sudo/locale/fi_FI/fusiondirectory.po
+++ b/sudo/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/fr/fusiondirectory.po b/sudo/locale/fr/fusiondirectory.po
index b42fb3c7836bd4fde8cc07f26af52af01195d456..88b76afab7c4877d5fda1655f533faadd7a0a2d9 100644
--- a/sudo/locale/fr/fusiondirectory.po
+++ b/sudo/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ã‰ric Deschamps <erdesc@free.fr>, 2013
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,41 +43,41 @@ msgstr "Branche oÃ¹ seront stockÃ©s les sudoers"
 msgid "Sudo management"
 msgstr "Gestion sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "Option inconnue"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "L'option sudo '%s' est invalideâ€¯!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Options disponibles"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Option"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "Ajouter une nouvelle option sudo "
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "Options sudo utilisÃ©es"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Options"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Options Sudo"
 
@@ -86,73 +85,77 @@ msgstr "Options Sudo"
 msgid "Sudo role"
 msgstr "RÃ´le sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr "ParamÃ¨tres du rÃ´le"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Nom du rÃ´le "
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Description"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "Description du nouveau rÃ´le sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Commandes"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "Une commande Unix avec Ã©ventuellement des arguments de ligne de commande, y compris des caractÃ¨res joker (wildcards)"
+msgstr ""
+"Une commande Unix avec Ã©ventuellement des arguments de ligne de commande, y "
+"compris des caractÃ¨res joker (wildcards)"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr "ExÃ©cuter comme (utilisateur)"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr "Utilisateur(s) personnifiÃ© par sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr "ExÃ©cuter comme (groupe)"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr "Groupe(s) personnifiÃ© par sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "SystÃ¨mes"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "Un nom d'hÃ´te, une adresse IP ou un rÃ©seau IP"
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Utilisateurs et groupes"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "Un nom d'utilisateur, ID utilisateur (prÃ©fixÃ© par '#'), groupe Unix (prÃ©fixÃ© par '%')"
+msgstr ""
+"Un nom d'utilisateur, ID utilisateur (prÃ©fixÃ© par '#'), groupe Unix (prÃ©fixÃ©"
+" par '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "PrioritÃ©"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr "La prioritÃ© de cette rÃ¨gle par rapport aux autres"
diff --git a/sudo/locale/hu_HU/fusiondirectory.po b/sudo/locale/hu_HU/fusiondirectory.po
index 91094ebae7b20eac5988e54c367cf2332c60e961..39ed28a5ae9f3f04b5a3f7980f8bcaad3d5037d9 100644
--- a/sudo/locale/hu_HU/fusiondirectory.po
+++ b/sudo/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "LeÃrÃ¡s"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/id/fusiondirectory.po b/sudo/locale/id/fusiondirectory.po
index adfc73376ef9f748632e9d8f407b2bca82a709bc..abc87d04af016969f744e53094dcebfc89215903 100644
--- a/sudo/locale/id/fusiondirectory.po
+++ b/sudo/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +42,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +84,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/it_IT/fusiondirectory.po b/sudo/locale/it_IT/fusiondirectory.po
index b509e37ffd85cd1fa7fcb915df79efaf79fd5042..e8faec9048060aafdc017e1bfa3e9ec2f54cf23d 100644
--- a/sudo/locale/it_IT/fusiondirectory.po
+++ b/sudo/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,41 +43,41 @@ msgstr "Ramo nel quale i sudo saranno immagazzinati"
 msgid "Sudo management"
 msgstr "Gestione di Sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "Opzione sconosciuta"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "L'opzione di sudo '%s' non Ã¨ valida !"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Opzioni disponibili"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Opzione"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "Aggiungi una nuova opzione sudo"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "Opzioni utilizzate del ruolo sudo"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Opzioni"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Opzioni di Sudo"
 
@@ -87,73 +85,77 @@ msgstr "Opzioni di Sudo"
 msgid "Sudo role"
 msgstr "Ruolo Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr "Impostazioni del ruolo"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Nome del ruolo"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "Descrizione per il nuovo ruolo di sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "comandi"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "Un comando Unix con gli argomenti della riga di comando opzionali, potenzialmente compresi i caratteri wildcard (jolly)"
+msgstr ""
+"Un comando Unix con gli argomenti della riga di comando opzionali, "
+"potenzialmente compresi i caratteri wildcard (jolly)"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr "Esegui come utente"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr "Utente(i) impersonato da Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr "Esegui come gruppo"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr "Grippo(i) impersonato da Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "Un nome d'host, indirizzo IP o network IP"
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Utenti e gruppi"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "Un nome utente, ID utente (prefissato da '#'), gruppo Unix (prefissato da '%')"
+msgstr ""
+"Un nome utente, ID utente (prefissato da '#'), gruppo Unix (prefissato da "
+"'%')"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "PrioritÃ "
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr "La prioritÃ  di questa regola comparata alle altre"
diff --git a/sudo/locale/lv/fusiondirectory.po b/sudo/locale/lv/fusiondirectory.po
index 43d581751ad7939dde11e7456bf36814ad064089..c002d286d27b152818fe1929a526bec5665a5579 100644
--- a/sudo/locale/lv/fusiondirectory.po
+++ b/sudo/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/nb/fusiondirectory.po b/sudo/locale/nb/fusiondirectory.po
index b9fd6ff6341209051c93991e0d5925164582fe7e..88311f1fd7e09f97e52c9b1250bf75d94e963035 100644
--- a/sudo/locale/nb/fusiondirectory.po
+++ b/sudo/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Navn"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/nl/fusiondirectory.po b/sudo/locale/nl/fusiondirectory.po
index 09a1cd935ad9ad544f3a6ae5405fb7ac69ad7deb..2b73c0a88d437bd81c1893ac7d12b22d2fabb32f 100644
--- a/sudo/locale/nl/fusiondirectory.po
+++ b/sudo/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: config/sudo/class_sudoConfig.inc:28
 msgid "Sudo configuration"
-msgstr ""
+msgstr "Sudo configuratie"
 
 #: config/sudo/class_sudoConfig.inc:29
 msgid "FusionDirectory sudo plugin configuration"
-msgstr ""
+msgstr "FusionDirectory sudo plugin configuratie"
 
 #: config/sudo/class_sudoConfig.inc:42 admin/sudo/class_sudoManagement.inc:32
 #: admin/sudo/class_sudoGeneric.inc:123
@@ -32,7 +33,7 @@ msgstr "Sudo"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Sudo RDN"
-msgstr ""
+msgstr "Sudo RDN"
 
 #: config/sudo/class_sudoConfig.inc:45
 msgid "Branch in which sudoers will be stored"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr "Sudo beheer"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "Onbekende optie"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "Deze sudo optie '%s' is ongeldig!"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "Beschikbare opties"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Optie"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
-msgstr ""
+msgstr "Voeg een nieuwe sudo optie toe"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Opties"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "Sudo opties"
 
@@ -84,73 +85,73 @@ msgstr "Sudo opties"
 msgid "Sudo role"
 msgstr "Sudo rol"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Naam"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Naam van de rol"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Commando's"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
-msgstr ""
+msgstr "Utivoeren als (gebruiker)"
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
-msgstr ""
+msgstr "Uitvoeren als (groep)"
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "Gebruikers en groepen"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/pl/fusiondirectory.po b/sudo/locale/pl/fusiondirectory.po
index c2c3150921c241fa21484843eccbffe73db35364..53b48f83ac635fd26d357a0ffde70ecc4d33e74b 100644
--- a/sudo/locale/pl/fusiondirectory.po
+++ b/sudo/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "Opcja"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Opcje"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Opis"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Priorytet"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/pt/fusiondirectory.po b/sudo/locale/pt/fusiondirectory.po
index 8257fb5e21611a71fe66e0d8b2d28d1349e7d39d..7b5a2fb2332781d2d646fc40d387c1480b9cd874 100644
--- a/sudo/locale/pt/fusiondirectory.po
+++ b/sudo/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/pt_BR/fusiondirectory.po b/sudo/locale/pt_BR/fusiondirectory.po
index 0d9deebc6e7a4cba6cc0dae9605ab039c6617274..418950bb09c9b1c1da6a2ed364f59e4c983f0ac8 100644
--- a/sudo/locale/pt_BR/fusiondirectory.po
+++ b/sudo/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr "Filial em que sudoers serÃ£o armazenados"
 msgid "Sudo management"
 msgstr "GestaÃ§Ã£o sudo"
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr "OpÃ§Ã£o desconhecida"
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr "A opÃ§Ã£o SUDO '%s' Ã© invÃ¡lida"
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr "OpÃ§Ãµes disponÃveis"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "OpÃ§Ã£o"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr "Adicionar nova opÃ§Ã£o de sudo"
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr "OpÃ§Ãµes de funÃ§Ãµes sudo utilizados"
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "OpÃ§Ãµes"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr "OpÃ§Ãµes de sudo"
 
@@ -84,73 +85,76 @@ msgstr "OpÃ§Ãµes de sudo"
 msgid "Sudo role"
 msgstr "FunÃ§Ã£o sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Nome"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Nome da atribuiÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr "DescriÃ§Ã£o da nova funÃ§Ã£o do sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr "Comandos"
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
-msgstr "Um comando Unix com argumento de linha de comando opcional, potencialmente incluindo caracteres globais(aka wild card)"
+msgstr ""
+"Um comando Unix com argumento de linha de comando opcional, potencialmente "
+"incluindo caracteres globais(aka wild card)"
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr "Um nome de host, endereÃ§o IP ou rede IP"
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "UsuÃ¡rios e grupos"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
-msgstr "Um nome de usuÃ¡rio, ID(Prefixado com'#'), grupo Unix(prefixado com '%')"
+msgstr ""
+"Um nome de usuÃ¡rio, ID(Prefixado com'#'), grupo Unix(prefixado com '%')"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/ru/fusiondirectory.po b/sudo/locale/ru/fusiondirectory.po
index 7f20034d9da449932d255966caf87a827f122840..0370ad091a209f8e965e14aa25df64ecac41983e 100644
--- a/sudo/locale/ru/fusiondirectory.po
+++ b/sudo/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr "Ð˜Ð¼Ñ Ñ€Ð¾Ð»Ð¸"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "ÐŸÑ€Ð¸Ð¾Ñ€Ð¸Ñ‚ÐµÑ‚"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/ru@petr1708/fusiondirectory.po b/sudo/locale/ru@petr1708/fusiondirectory.po
index b1a74b02c8cc897e97db6ac937c33c53e9474385..09519be0e71e0ccb44c60b21efca55583febc992 100644
--- a/sudo/locale/ru@petr1708/fusiondirectory.po
+++ b/sudo/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +42,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +84,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/sv/fusiondirectory.po b/sudo/locale/sv/fusiondirectory.po
index c2094e0c8e6b5071d5b39dfff27dbbd6ec654d0a..4e52cd674494ee265d658774573e338219346632 100644
--- a/sudo/locale/sv/fusiondirectory.po
+++ b/sudo/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "Alternativ"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "Namn"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "System"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "Prioritet"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/ug/fusiondirectory.po b/sudo/locale/ug/fusiondirectory.po
index 960c4d05e183fed80f9f7e0f90110368ced9bc9b..24b8875510acf91cce1093c0267690e9b1ccd1d7 100644
--- a/sudo/locale/ug/fusiondirectory.po
+++ b/sudo/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +42,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +84,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/vi_VN/fusiondirectory.po b/sudo/locale/vi_VN/fusiondirectory.po
index 127b9c8fd6c18feb4ff1f087754d0d4b78a0adb0..786d31ff9d41ff8701cb75112cfb6ab2c97c7aef 100644
--- a/sudo/locale/vi_VN/fusiondirectory.po
+++ b/sudo/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "CÃ¡c há»‡ thá»‘ng"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/sudo/locale/zh/fusiondirectory.po b/sudo/locale/zh/fusiondirectory.po
index 93c3058ce2e6ee9893894c013138a7294ca7118c..dbeeb3fab02e838fd72a248cd3a7f739609e9089 100644
--- a/sudo/locale/zh/fusiondirectory.po
+++ b/sudo/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,41 +43,41 @@ msgstr ""
 msgid "Sudo management"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:82
+#: admin/sudo/class_sudoOption.inc:77
 msgid "Unknown option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:83
+#: admin/sudo/class_sudoOption.inc:78
 #, php-format
 msgid "The sudo option '%s' is invalid!"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:278
+#: admin/sudo/class_sudoOption.inc:273
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:480
+#: admin/sudo/class_sudoOption.inc:476
 msgid "Available options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Option"
 msgstr "é€‰é¡¹"
 
-#: admin/sudo/class_sudoOption.inc:483
+#: admin/sudo/class_sudoOption.inc:479
 msgid "Add a new sudo option"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:488 admin/sudo/class_sudoOption.inc:490
+#: admin/sudo/class_sudoOption.inc:484 admin/sudo/class_sudoOption.inc:486
 msgid "Used sudo role options"
 msgstr ""
 
-#: admin/sudo/class_sudoOption.inc:557
+#: admin/sudo/class_sudoOption.inc:553
 msgid "Options"
 msgstr "é€‰é¡¹"
 
-#: admin/sudo/class_sudoOption.inc:558
+#: admin/sudo/class_sudoOption.inc:554
 msgid "Sudo options"
 msgstr ""
 
@@ -84,73 +85,73 @@ msgstr ""
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:143
+#: admin/sudo/class_sudoGeneric.inc:154
 msgid "Role settings"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/sudo/class_sudoGeneric.inc:149
+#: admin/sudo/class_sudoGeneric.inc:160
 msgid "Name of the role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description"
 msgstr "æè¿°"
 
-#: admin/sudo/class_sudoGeneric.inc:154
+#: admin/sudo/class_sudoGeneric.inc:165
 msgid "Description for the new sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:159
+#: admin/sudo/class_sudoGeneric.inc:170
 msgid "Commands"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:160
+#: admin/sudo/class_sudoGeneric.inc:171
 msgid ""
 "A Unix command with optional command line arguments, potentially including "
 "globbing characters (aka wild cards)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:166
+#: admin/sudo/class_sudoGeneric.inc:177
 msgid "Run as (user)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:167
+#: admin/sudo/class_sudoGeneric.inc:178
 msgid "User(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:174
+#: admin/sudo/class_sudoGeneric.inc:185
 msgid "Run as (group)"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:175
+#: admin/sudo/class_sudoGeneric.inc:186
 msgid "Group(s) impersonated by sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "Systems"
 msgstr "ç³»ç»Ÿè®¾ç½®"
 
-#: admin/sudo/class_sudoGeneric.inc:181
+#: admin/sudo/class_sudoGeneric.inc:192
 msgid "A host name, IP address or IP network"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:186
+#: admin/sudo/class_sudoGeneric.inc:197
 msgid "Users and groups"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:187
+#: admin/sudo/class_sudoGeneric.inc:198
 msgid ""
 "A user name, user ID (prefixed with '#'), Unix group (prefixed with '%')"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "Priority"
 msgstr "ä¼˜å…ˆçº§"
 
-#: admin/sudo/class_sudoGeneric.inc:191
+#: admin/sudo/class_sudoGeneric.inc:202
 msgid "This rule priority compared to others"
 msgstr ""
diff --git a/supann/admin/supannStructures/class_etablissement.inc b/supann/admin/supannStructures/class_etablissement.inc
index 9e30b3541d11a174a0474c78ab41adebf5f122f7..2b7d3a0e3c68b5a1892e5883209faf8ade8a97d6 100644
--- a/supann/admin/supannStructures/class_etablissement.inc
+++ b/supann/admin/supannStructures/class_etablissement.inc
@@ -138,7 +138,10 @@ class etablissement extends simplePlugin
   function remove_from_parent()
   {
     global $config;
-    parent::remove_from_parent();
+    $errors = parent::remove_from_parent();
+    if (!empty($errors)) {
+      return $errors;
+    }
 
     /* If we're the root etablissement, delete it too */
     $root_code = $this->get_root_code();
@@ -151,10 +154,10 @@ class etablissement extends simplePlugin
     }
   }
 
-  function ldap_save($cleanup = TRUE)
+  function ldap_save()
   {
     global $config;
-    parent::ldap_save($cleanup);
+    $errors = parent::ldap_save();
 
     $ldap = $config->get_ldap_link();
 
@@ -197,9 +200,10 @@ class etablissement extends simplePlugin
         $ldap->$root_mode($root_attrs);
       }
       if (!$ldap->success()) {
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()), LDAP_ERROR);
+        $errors[] = msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class());
       }
     }
+    return $errors;
   }
 
   function get_root_code()
@@ -208,12 +212,12 @@ class etablissement extends simplePlugin
     $ldap = $config->get_ldap_link();
 
     $ldap->cd($config->current['BASE']);
-    $ldap->ls('(objectClass=supannOrg)');
+    $ldap->search('(objectClass=supannOrg)', array('*'), 'one');
 
     if ($ldap->count() > 1) {
       msg_dialog::display(_('LDAP error'), 'There are several Establishment at root!');
       return FALSE;
-    } else if ($ldap->count() > 0) {
+    } elseif ($ldap->count() > 0) {
       $attr = $ldap->fetch();
       return $attr['supannEtablissement'][0];
     } else {
diff --git a/supann/contrib/supann/affiliation b/supann/contrib/supann/affiliation
index b09b3dde785484029b3021f160f8926f6c7380f1..90512bc4af9f22b02edec3f32a6a079dba1bed13 100644
--- a/supann/contrib/supann/affiliation
+++ b/supann/contrib/supann/affiliation
@@ -8,7 +8,6 @@ member;Personnel interne Ã  l'Ã©tablissement
 affiliate;Personnel externe Ã  l'Ã©tablissement
 alum;Ancien Ã©tudiant gardant des relations avec l'Ã©tablissement
 library-walk-in;Lecteur autorisÃ© Ã  la bibliothÃ¨que
-registered-reader;Lecteur autorisÃ© Ã  la bibliothÃ¨que
 researcher;Personnel Chercheur
 retired;Personnel Ã  la retraite gardant des relations avec l'Ã©tablissement
 emeritus;Personnel ayant l'Ã©mÃ©ritat
diff --git a/supann/locale/ar/fusiondirectory.po b/supann/locale/ar/fusiondirectory.po
index 824cf86af62f3a08279fa230739b1a2fa2027408..7c88ab78284b62929380c2db331f7b1297abcce9 100644
--- a/supann/locale/ar/fusiondirectory.po
+++ b/supann/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/ca/fusiondirectory.po b/supann/locale/ca/fusiondirectory.po
index 961d2b65c0e58dd4496b7a65984bd58574acf6e4..60541bc01911496dd23b740d8ce050460057867c 100644
--- a/supann/locale/ca/fusiondirectory.po
+++ b/supann/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
diff --git a/supann/locale/cs_CZ/fusiondirectory.po b/supann/locale/cs_CZ/fusiondirectory.po
index 809eaf0853f0b8b242ba9ae81e367763e1c21a8d..206431d9aa4a66b2682f660ff5f11cded75b3e7f 100644
--- a/supann/locale/cs_CZ/fusiondirectory.po
+++ b/supann/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,7 +37,7 @@ msgstr "Ph.D."
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "Another class of degree"
-msgstr "JinÃ½ stupeÅˆ vzdÄ›lÃ¡nÃ"
+msgstr "JinÃ¡ tÅ™Ãda hodnocenÃ"
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "post-graduate year"
@@ -86,309 +87,327 @@ msgstr "SupAnn"
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "Identita"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr "ZdvoÅ™ilostnÃ"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr "supannCivilite â€“ oslovenÃ tÃ©to osoby"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr "AlternativnÃ pÅ™ihlaÅ¡ovacÃ jmÃ©no"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
-msgstr "supannAliasLogin â€“ alternativnÃ nÃ¡zev pro pÅ™ihlaÅ¡ovacÃ jmÃ©no tohoto uÅ¾ivatele"
+msgstr ""
+"supannAliasLogin â€“ alternativnÃ nÃ¡zev pro pÅ™ihlaÅ¡ovacÃ jmÃ©no tohoto "
+"uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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"
+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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "PÅ™ezdÃvka"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 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:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr "IdentifikÃ¡tory reference"
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
-msgstr "supannRefId â€“ IdentifikÃ¡tory/odkazy tohoto uÅ¾ivatele na ostatnÃch systÃ©mech"
+msgstr ""
+"supannRefId â€“ IdentifikÃ¡tory/odkazy tohoto uÅ¾ivatele na ostatnÃch systÃ©mech"
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
-msgstr "Kontakt"
+msgstr "kontakt"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "OstatnÃ telefonnÃ ÄÃsla"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr "supannAutreTelephone â€“ ostatnÃ telefonnÃ ÄÃsla tohoto uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "OstatnÃ e-mailovÃ© adresy"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
-msgstr "supannAutreMail â€“ ostatnÃ e-mailovÃ© adresy tohoto uÅ¾ivatele. Nemohou se opakovat"
+msgstr ""
+"supannAutreMail â€“ ostatnÃ e-mailovÃ© adresy tohoto uÅ¾ivatele. Nemohou se "
+"opakovat"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "OsobnÃ e-mailovÃ¡ adresa"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr "supannMailPerso â€“ soukromÃ¡ poÅ¡tovnÃ adresa tohoto uÅ¾ivatele"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr "seznam blokovanÃ½ch"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr "supannListeRouge â€“ Zda by tato osoba mÄ›la bÃ½t na seznamu blokovanÃ½ch"
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr "PÅ™iÅ™azenÃ"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr "HlavnÃ pÅ™iÅ™azenÃ entity"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr "supannEntiteAffectationPrincipale â€“ hlavnÃ pÅ™iÅ™azenÃ tÃ©to osoby"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr "PÅ™iÅ™azenÃ entity"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
-msgstr "supannEntiteAffectation â€“ pÅ™edstavuje pÅ™iÅ™azenÃ tÃ©to osoby v instituci, souÄÃ¡sti, sluÅ¾bÄ›, atd."
+msgstr ""
+"supannEntiteAffectation â€“ pÅ™edstavuje pÅ™iÅ™azenÃ tÃ©to osoby v instituci, "
+"souÄÃ¡sti, sluÅ¾bÄ›, atd."
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr "PÅ™iÅ™azenÃ typu entity"
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr "PÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr "HlavnÃ pÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr "eduPersonPrimaryAffiliation â€“ hlavnÃ status osoby"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr "PÅ™idruÅ¾enÃ"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
-msgstr "eduPersonAffiliation â€“ status osobz: student, BIATOSS, pedagog, externista, penzionovanÃ½, hostovanÃ½ personÃ¡l (CNRS, INSERM, atd.), dÅ™ÃvÄ›jÅ¡Ã student, atd."
+msgstr ""
+"eduPersonAffiliation â€“ status osobz: student, BIATOSS, pedagog, externista, "
+"penzionovanÃ½, hostovanÃ½ personÃ¡l (CNRS, INSERM, atd.), dÅ™ÃvÄ›jÅ¡Ã student, "
+"atd."
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr "Instituce"
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
-msgstr "supannEtablissement â€“ instituce nebo administrativnÃ jednotka tÃ©to osoby"
+msgstr ""
+"supannEtablissement â€“ instituce nebo administrativnÃ jednotka tÃ©to osoby"
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr "Profil studenta"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr "KÃ³d INE"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr "supannCodeINE â€“ INE kÃ³d tohoto studenta"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr "IdentifikÃ¡tor studenta"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr "supannEtuId â€“ identifikÃ¡tor vÃ½uky"
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr "ZÃ¡pisy studenta"
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr "supannEtuInscription â€“ zÃ¡pisy tohoto studenta"
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr "supannEtablissement â€“ Instituce, ve kterÃ© bylo toto zapsÃ¡nÃ provedeno"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "rok"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr "supannEtuAnneeInscription â€“ rok, ve kterÃ©m tento zÃ¡pis zaÄne"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
-msgstr "Typ zapsÃ¡nÃ se"
+msgstr "Typ pÅ™edplatnÃ©ho"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr "supannEtuRegimeInscription â€“ typ tohoto zapsÃ¡nÃ"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr "KÃ¡rnÃ© Å™ÃzenÃ"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
-msgstr "supannEtuSecteurDisciplinaire â€“ vÃ½ukovÃ½ diplom disciplinÃ¡rnÃho sektoru"
+msgstr ""
+"supannEtuSecteurDisciplinaire â€“ vÃ½ukovÃ½ diplom disciplinÃ¡rnÃho sektoru"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr "Typ diplomu"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr "supannEtuTypeDiplome â€“ typ diplomu"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr "Rok studijnÃho plÃ¡nu"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
-msgstr "supannEtuCursusAnnee â€“ typ Å¾ivotopisu (L, M, D nebo X, â€¦) a rok zÃskÃ¡nÃ diplomu."
+msgstr ""
+"supannEtuCursusAnnee â€“ typ Å¾ivotopisu (L, M, D nebo X, â€¦) a rok zÃskÃ¡nÃ "
+"diplomu."
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr "Diplom"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr "supannEtuDiplome â€“ Diplom, pÅ™ipravenÃ½ tÃmto studentem"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr "StupeÅˆ"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
-msgstr "supannEtuEtape â€“ krok mÅ¯Å¾e bÃ½t povaÅ¾ovÃ¡n za ÄÃ¡st (semestr, rok, atd.) v dobÄ› vÃ½uky, vedoucÃ k zÃskÃ¡nÃ diplomu"
+msgstr ""
+"supannEtuEtape â€“ krok mÅ¯Å¾e bÃ½t povaÅ¾ovÃ¡n za ÄÃ¡st (semestr, rok, atd.) v dobÄ›"
+" vÃ½uky, vedoucÃ k zÃskÃ¡nÃ diplomu"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr "vÃ½ukovÃ½ prvek"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr "supannEtuElementPedagogique â€“ ObecnÃ½, ÄlenÄ›nÃ½ popis obsahu vÃ½uky"
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr "OsobnÃ profil"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr "OsobnÃ identifikÃ¡tor"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr "supannEmpId â€“ ÄÃslo zamÄ›stnance"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr "OsobnÃ sbor"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr "Aktivita"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr "supannActivite â€“ kategorie profese"
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
-msgstr "Role"
+msgstr "role"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr "ObecnÃ¡ role"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr "supannRoleGenerique â€“ obecnÃ© role tÃ©to osoby v zaÅ™ÃzenÃ"
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Typ pÅ™iÅ™azenÃ entity"
 
@@ -420,7 +439,9 @@ msgstr "SUPANN e-mailovÃ¡ adresa pro obnovu"
 msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
-msgstr "UmoÅ¾nit pro obnovenÃ zapomenutÃ©ho hesla pouÅ¾Ãt e-mailovou adresu ze SUPANN ÃºÄtu, z kolonky osobnÃ e-mailovÃ¡ adresa"
+msgstr ""
+"UmoÅ¾nit pro obnovenÃ zapomenutÃ©ho hesla pouÅ¾Ãt e-mailovou adresu ze SUPANN "
+"ÃºÄtu, z kolonky osobnÃ e-mailovÃ¡ adresa"
 
 #: admin/supannStructures/class_supannStructuresManagement.inc:35
 msgid "Supann structures"
@@ -432,12 +453,12 @@ msgstr "SprÃ¡va struktur Supann"
 
 #: admin/supannStructures/class_supann.inc:53
 msgid "File error"
-msgstr "Chyba v souboru"
+msgstr "Chyba souboru"
 
 #: admin/supannStructures/class_supann.inc:54
 #, php-format
 msgid "Cannot read file: '%s'"
-msgstr "Nelze naÄÃst soubor: %s"
+msgstr "Soubor nelze naÄÃst: \"%s\""
 
 #: admin/supannStructures/class_etablissement.inc:32
 msgid "SUPANN Establishment Settings"
@@ -449,7 +470,7 @@ msgstr "SUPANN instituce"
 
 #: admin/supannStructures/class_etablissement.inc:52
 msgid "Properties"
-msgstr "Vlastnosti"
+msgstr "vlastnosti"
 
 #: admin/supannStructures/class_etablissement.inc:55
 msgid "Root Establishment"
@@ -462,7 +483,7 @@ msgstr "Nastavit tuto instituci jako koÅ™enovou"
 #: admin/supannStructures/class_etablissement.inc:59
 #: admin/supannStructures/class_entite.inc:55
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/supannStructures/class_etablissement.inc:59
 msgid "The name to write in the o attribute for this Establishment"
@@ -471,7 +492,7 @@ msgstr "NÃ¡zev, kterÃ½ zapsat do atributu o (Ã³) tÃ©to instituce"
 #: admin/supannStructures/class_etablissement.inc:63
 #: admin/supannStructures/class_entite.inc:76
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/supannStructures/class_etablissement.inc:63
 msgid "A short description of this Establishment"
@@ -480,7 +501,7 @@ msgstr "StruÄnÃ½ popis tÃ©to instituce"
 #: admin/supannStructures/class_etablissement.inc:69
 #: admin/supannStructures/class_etablissement.inc:72
 msgid "Location"
-msgstr "UmÃstÄ›nÃ"
+msgstr "umÃstÄ›nÃ"
 
 #: admin/supannStructures/class_etablissement.inc:72
 msgid "Usually the city where this Establishment is"
@@ -488,7 +509,7 @@ msgstr "Obvykle mÄ›sto, ve kterÃ©m se tato instituce nachÃ¡zÃ"
 
 #: admin/supannStructures/class_etablissement.inc:76
 msgid "Address"
-msgstr "Adresa"
+msgstr "adresa"
 
 #: admin/supannStructures/class_etablissement.inc:76
 msgid "The postal address of this Establishment"
@@ -497,7 +518,7 @@ msgstr "PoÅ¡tovnÃ adresa tÃ©to instituce"
 #: admin/supannStructures/class_etablissement.inc:80
 #: admin/supannStructures/class_entite.inc:64
 msgid "Telephone"
-msgstr "Telefon"
+msgstr "telefon"
 
 #: admin/supannStructures/class_etablissement.inc:80
 msgid "Phone number for this Establishment"
@@ -506,7 +527,7 @@ msgstr "TelefonnÃ ÄÃslo do tÃ©to instituce"
 #: admin/supannStructures/class_etablissement.inc:84
 #: admin/supannStructures/class_entite.inc:68
 msgid "Fax"
-msgstr "Fax"
+msgstr "fax"
 
 #: admin/supannStructures/class_etablissement.inc:84
 msgid "Fax number for this Establishment"
@@ -522,7 +543,9 @@ msgstr "KÃ³d instituce"
 
 #: admin/supannStructures/class_etablissement.inc:93
 msgid "The code of this Establishment (must have a prefix between {})"
-msgstr "KÃ³d tÃ©to instituce (je tÅ™eba, pÅ™edponu byla uvedena ve sloÅ¾enÃ½ch zÃ¡vorkÃ¡ch â€“ { } )"
+msgstr ""
+"KÃ³d tÃ©to instituce (je tÅ™eba, pÅ™edponu byla uvedena ve sloÅ¾enÃ½ch zÃ¡vorkÃ¡ch â€“"
+" { } )"
 
 #: admin/supannStructures/class_etablissement.inc:98
 msgid "SUPANN code"
@@ -564,11 +587,10 @@ msgstr "URI adresa â€žbÃlÃ½ch strÃ¡nekâ€œ (white pages)"
 msgid "The URI of this Establishment white pages"
 msgstr "URI adresa â€žbÃlÃ½ch strÃ¡nekâ€œ (UDDI) tÃ©to instituce"
 
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
-msgstr "Chyba LDAP"
+msgstr "chyba LDAPu"
 
 #: admin/supannStructures/class_entite.inc:31
 #: admin/supannStructures/class_entite.inc:52
@@ -601,7 +623,7 @@ msgstr "FaxovÃ© ÄÃslo tÃ©to entity"
 
 #: admin/supannStructures/class_entite.inc:72
 msgid "Postal address"
-msgstr "PoÅ¡tovnÃ adresa"
+msgstr "poÅ¡tovnÃ adresa"
 
 #: admin/supannStructures/class_entite.inc:72
 msgid "Postal address of this entity"
diff --git a/supann/locale/de/fusiondirectory.po b/supann/locale/de/fusiondirectory.po
index 0e41cc6fa2b83d1e63677922d5fd25e1b5f6b7ab..37b2e46682b8dcbaa3fc9a3ae33605bd73cf5f1c 100644
--- a/supann/locale/de/fusiondirectory.po
+++ b/supann/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr "SupAnn"
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "IdentitÃ¤t"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr "Aliasanmeldung"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "Kurzname"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "Andere Telefonnummern"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "Andere E-Mail-Adressen"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "PersÃ¶nliche E-Mail-Adressen"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr "rote Liste"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr "Einheitszuordnung"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr "Einheitstypzuordnung"
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr "INE-Code"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "Jahr"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr "Abonnementstyp"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr "Diplom"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr "Schritt"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr "PersÃ¶nliches Profil"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr "PersÃ¶nliche Kennung"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr "AktivitÃ¤t"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Rollen"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr "Generische Rolle"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Einheitszuordnungstyp"
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -601,7 +601,7 @@ msgstr "Faxnummer fÃ¼r diese Einheit"
 
 #: admin/supannStructures/class_entite.inc:72
 msgid "Postal address"
-msgstr "Postalische Anschrift"
+msgstr "Adresse"
 
 #: admin/supannStructures/class_entite.inc:72
 msgid "Postal address of this entity"
diff --git a/supann/locale/el_GR/fusiondirectory.po b/supann/locale/el_GR/fusiondirectory.po
index 027c3751d5bdd76f385c00aba01507cc7d29a9ea..84d90c2f9ded1ce4fa2136fc1f96e4e159500678 100644
--- a/supann/locale/el_GR/fusiondirectory.po
+++ b/supann/locale/el_GR/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "Î¤Î±Ï…Ï„ÏŒÏ„Î·Ï„Î±"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr "Î™Î¸Î±Î³ÎÎ½ÎµÎ¹Î±"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr "eduPersonPrincipalName"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "Î¨ÎµÏ…Î´ÏŽÎ½Ï…Î¼Î¿"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Î•Ï€Î±Ï†Î®"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "Î†Î»Î»Î¿Î¹ Î±ÏÎ¹Î¸Î¼Î¿Î¯ Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "Î†Î»Î»ÎµÏ‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr "ÎºÏŒÎºÎºÎ¹Î½Î· Î»Î¯ÏƒÏ„Î±"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr "Î•Î³ÎºÎ±Î¸Î¯Î´ÏÏ…ÏƒÎ·"
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr "Î ÏÎ¿Ï†Î¯Î» Î¼Î±Î¸Î·Î®"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr "INE code"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr "ID ÎœÎ±Î¸Î·Ï„Î®"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr "Î£Ï…Î½Î´ÏÎ¿Î¼ÎÏ‚ Î¼Î±Î¸Î·Ï„Î®"
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "ÎˆÏ„Î¿Ï‚"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ ÏƒÏ…Î½Î´ÏÎ¿Î¼Î®Ï‚"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ Î´Î¹Ï€Î»ÏŽÎ¼Î±Ï„Î¿Ï‚"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr "Î’Î®Î¼Î±"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr "ÎµÎºÏ€Î±Î¹Î´ÎµÏ…Ï„Î¹ÎºÏŒ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒ Ï€ÏÎ¿Ï†Î¯Î»"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ® ID"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr "supannEmpId - Î‘Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ ÎµÏÎ³Î±Î¶Î¿Î¼ÎÎ½Î¿Ï…"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr "Personal corps"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr "Î”ÏÎ±ÏƒÏ„Î·ÏÎ¹ÏŒÏ„Î·Ï„Î±"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Î¡ÏŒÎ»Î¿Î¹"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr "Î“ÎµÎ½Î¹ÎºÏŒÏ‚ ÏÏŒÎ»Î¿Ï‚"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Î¤ÏÏ€Î¿Ï‚ Î±Î½Î¬Î¸ÎµÏƒÎ·Ï‚ Î¿Î½Ï„ÏŒÏ„Î·Ï„Î±Ï‚"
 
@@ -524,7 +523,8 @@ msgstr "ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
 #: admin/supannStructures/class_etablissement.inc:93
 msgid "The code of this Establishment (must have a prefix between {})"
-msgstr "ÎŸ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ (Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÎÎ½Î± Ï€ÏÏŒÎ¸ÎµÎ¼Î± Î¼ÎµÏ„Î±Î¾Ï {})"
+msgstr ""
+"ÎŸ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ (Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÎÎ½Î± Ï€ÏÏŒÎ¸ÎµÎ¼Î± Î¼ÎµÏ„Î±Î¾Ï {})"
 
 #: admin/supannStructures/class_etablissement.inc:98
 msgid "SUPANN code"
@@ -566,9 +566,8 @@ msgstr ""
 msgid "The URI of this Establishment white pages"
 msgstr "Î¤Î¿ URI Ï„Ï‰Î½ Î»ÎµÏ…ÎºÏŽÎ½ ÏƒÎµÎ»Î¯Î´Ï‰Î½ Ï„Î·Ï‚ Î•Î³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
 
diff --git a/supann/locale/en/fusiondirectory.po b/supann/locale/en/fusiondirectory.po
index 3f3fc8452c68379f7b6215196d0653f26ec3f152..2f6a9aa86df844544e4551cdb0dd5d011aaf488a 100644
--- a/supann/locale/en/fusiondirectory.po
+++ b/supann/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -86,308 +86,308 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -563,9 +563,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/es/fusiondirectory.po b/supann/locale/es/fusiondirectory.po
index ee77fafd78de52f3e8c7b97b8c617197d2545ca1..ba489d3d8deba9364cebbb8a972945996fff08c4 100644
--- a/supann/locale/es/fusiondirectory.po
+++ b/supann/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr "SUPANN"
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "AÃ±o"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Roles"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Error LDAP"
 
diff --git a/supann/locale/es_CO/fusiondirectory.po b/supann/locale/es_CO/fusiondirectory.po
index 41194d2fea304f866f874b06fbb8ff5ab4f15cb3..8d441beb66fd2d8b665636fb4f9d4b2eae63dcde 100644
--- a/supann/locale/es_CO/fusiondirectory.po
+++ b/supann/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Error LDAP"
 
diff --git a/supann/locale/es_VE/fusiondirectory.po b/supann/locale/es_VE/fusiondirectory.po
index 755e2ad74b837942126926427278dd75c8bea0b9..300ca5d9eb773ef84022d65cd61d8f8b7b514d2f 100644
--- a/supann/locale/es_VE/fusiondirectory.po
+++ b/supann/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr "SUPANN"
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contacto"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "AÃ±o"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Roles"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Error de LDAP"
 
diff --git a/supann/locale/fa_IR/fusiondirectory.po b/supann/locale/fa_IR/fusiondirectory.po
index 213a4449fc7bfe0f58fc98938e073c6ccc283bdf..e7ce369ec95c5d5254e427e6b0df7b727815a303 100644
--- a/supann/locale/fa_IR/fusiondirectory.po
+++ b/supann/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Ø®Ø·Ø§ÛŒ LDAP"
 
diff --git a/supann/locale/fi_FI/fusiondirectory.po b/supann/locale/fi_FI/fusiondirectory.po
index 97594be729aeb90e028d58e8c7939af12f036221..b5fc724e6404b88932cdf4cea7e46e61517dc7fa 100644
--- a/supann/locale/fi_FI/fusiondirectory.po
+++ b/supann/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Yhteystiedot"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP virhe"
 
diff --git a/supann/locale/fr/fusiondirectory.po b/supann/locale/fr/fusiondirectory.po
index 82f13f9c944df6f6f992bb180e9276d664e7c0b0..3cc3a8ec57fcb7df9e4a5c3463af56b6260c8307 100644
--- a/supann/locale/fr/fusiondirectory.po
+++ b/supann/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2016
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,309 +87,337 @@ msgstr "SupAnn"
 msgid "SupAnn information management plugin"
 msgstr "Plugin de gestion des informations SUPANN"
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "IdentitÃ©"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr "CivilitÃ©"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr "CivilitÃ© pour cette personne"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr "Alias de l'identifiant"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr "supannAliasLogin - Alias de l'identifiant de connexion"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr "Nom principal eduPerson"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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 "
+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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "Surnom"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr "eduPersonNickName - peut contenir un surnom pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr "Ids de rÃ©fÃ©rences"
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr "supannRefId - ID / liens pour cet utilisateur sur d'autres systÃ¨mes"
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "Autre numÃ©ros de tÃ©lÃ©phone"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
-msgstr "supannAutreTelephone - Autres numÃ©ros de tÃ©lÃ©phone pour cet utilisateur"
+msgstr ""
+"supannAutreTelephone - Autres numÃ©ros de tÃ©lÃ©phone pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "Autres adresses courriel"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
-msgstr "supannAutreMail - Autres adresses de courriel pour cet utilisateur. Chacune doit Ãªtre unique"
+msgstr ""
+"supannAutreMail - Autres adresses de courriel pour cet utilisateur. Chacune "
+"doit Ãªtre unique"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "Adresse courriel personnelle"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
-msgstr "supannMailPerso - Adresse de courriel personnelle pour cet utilisateur"
+msgstr ""
+"supannMailPerso - Adresse de courriel personnelle pour cet utilisateur"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr "Liste rouge"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
-msgstr "supannListeRouge - Cette personne ne doit pas apparaÃ®tre dans les annuaires pages blanches"
+msgstr ""
+"supannListeRouge - Cette personne ne doit pas apparaÃ®tre dans les annuaires "
+"pages blanches"
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr "Affectation"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr "Affectation principale"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
-msgstr "supannEntiteAffectationPrincipale - Affectation principale de la personne"
+msgstr ""
+"supannEntiteAffectationPrincipale - Affectation principale de la personne"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr "EntitÃ©s affectÃ©es"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
-msgstr "supannEntiteAffectation - reprÃ©sente les affectations de la personne dans une institution, d'un composant, le service, etc."
+msgstr ""
+"supannEntiteAffectation - reprÃ©sente les affectations de la personne dans "
+"une institution, d'un composant, le service, etc."
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr "Type dâ€™affectation"
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr "supannTypeEntiteAffectation"
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr "Affiliation"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr "Affiliation principale"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr "eduPersonPrimaryAffiliation - Le statut principal de la personne"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr "Affiliations"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
-msgstr "eduPersonAffiliation - statut de la personneâ€¯: Ã©tudiant, BIATOSS, enseignant, sous contrat, retraitÃ©, personnel hÃ©bergÃ© (CNRS, INSERM, etc.), un ancien Ã©tudiant, etc."
+msgstr ""
+"eduPersonAffiliation - statut de la personneâ€¯: Ã©tudiant, BIATOSS, "
+"enseignant, sous contrat, retraitÃ©, personnel hÃ©bergÃ© (CNRS, INSERM, etc.), "
+"un ancien Ã©tudiant, etc."
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr "Ã‰tablissement"
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
-msgstr "supannEtablissement - institution ou unitÃ© de rattachement administratif de la personne"
+msgstr ""
+"supannEtablissement - institution ou unitÃ© de rattachement administratif de "
+"la personne"
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr "Profil Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr "Code INE"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr "supannCodeINE - code INE de l'Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr "Identifiant Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr "supannEtuId - identifiant scolaire"
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr "Inscriptions de l'Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr "supannEtuInscription - Inscriptions pour cet Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
-msgstr "supannEtablissement - Ã‰tablissement dans lequel l'inscription a Ã©tÃ© faite"
+msgstr ""
+"supannEtablissement - Ã‰tablissement dans lequel l'inscription a Ã©tÃ© faite"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "AnnÃ©e"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr "supannEtuAnneeInscription - AnnÃ©e d'inscription"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr "Type d'inscription"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr "supannEtuRegimeInscription - Type d'inscription"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr "Secteur disciplinaire"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
-msgstr "supannEtuSecteurDisciplinaire - Secteur disciplinaire de diplÃ´me ou d'enseignement"
+msgstr ""
+"supannEtuSecteurDisciplinaire - Secteur disciplinaire de diplÃ´me ou "
+"d'enseignement"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr "Type de diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr "supannEtuTypeDiplome - Type de diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr "AnnÃ©e cursus"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
-msgstr "supannEtuCursusAnnee - prÃ©cise le type de cursus (L, M, D ou X, etc.) ainsi que l'annÃ©e dans le diplÃ´me"
+msgstr ""
+"supannEtuCursusAnnee - prÃ©cise le type de cursus (L, M, D ou X, etc.) ainsi "
+"que l'annÃ©e dans le diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr "EntitÃ© d'affectation "
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr "DiplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr "supannEtuDiplome - DiplÃ´me prÃ©parÃ© par l'Ã©tudiant"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr "Ã‰tape"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
-msgstr "supannEtuEtape - fractionnement (semestre, annÃ©e, etc.) dans le temps d'un enseignement conduisant Ã  un diplÃ´me"
+msgstr ""
+"supannEtuEtape - fractionnement (semestre, annÃ©e, etc.) dans le temps d'un "
+"enseignement conduisant Ã  un diplÃ´me"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr "Ã‰lÃ©ment pÃ©dagogique"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
-msgstr "supannEtuElementPedagogique - Description gÃ©nÃ©rique du contenu d'un enseignement ayant le niveau de granularitÃ© dÃ©sirÃ©"
+msgstr ""
+"supannEtuElementPedagogique - Description gÃ©nÃ©rique du contenu d'un "
+"enseignement ayant le niveau de granularitÃ© dÃ©sirÃ©"
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr "Profil personnel"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr "Identifiant personnel"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr "supannEmpId - Identifiant de l'employÃ©"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr "Corps d'appartenance"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr "supannEmpCorps - corps d'appartenance d'un agent"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr "ActivitÃ©"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr "supannActivite - catÃ©gorie de mÃ©tier, branche d'activitÃ©"
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "RÃ´les"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
-msgstr "supannRoleEntite - attribut composite. Chaque valeur prÃ©cise un rÃ´le spÃ©cifique dans une entitÃ© (rÃ´le structurel et/ou Ã©lectif)"
+msgstr ""
+"supannRoleEntite - attribut composite. Chaque valeur prÃ©cise un rÃ´le "
+"spÃ©cifique dans une entitÃ© (rÃ´le structurel et/ou Ã©lectif)"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr "RÃ´le gÃ©nÃ©rique"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
-msgstr "supannRoleGenerique - RÃ´les gÃ©nÃ©riques de la personne dans l'Ã©tablissement"
+msgstr ""
+"supannRoleGenerique - RÃ´les gÃ©nÃ©riques de la personne dans l'Ã©tablissement"
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Type dâ€™affectation"
 
@@ -422,7 +449,9 @@ msgstr "RÃ©cupÃ©ration du mot de passe par supannMailPerso"
 msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
-msgstr "Autoriser les utilisateurs Ã  utiliser leur adresse de courriel SUPANN personnelle pour la rÃ©cupÃ©ration de leur mot de passe"
+msgstr ""
+"Autoriser les utilisateurs Ã  utiliser leur adresse de courriel SUPANN "
+"personnelle pour la rÃ©cupÃ©ration de leur mot de passe"
 
 #: admin/supannStructures/class_supannStructuresManagement.inc:35
 msgid "Supann structures"
@@ -566,9 +595,8 @@ msgstr "Annuaire pages blanches"
 msgid "The URI of this Establishment white pages"
 msgstr "Lâ€™URI des pages blanches de cet Ã©tablissement"
 
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
diff --git a/supann/locale/hu_HU/fusiondirectory.po b/supann/locale/hu_HU/fusiondirectory.po
index 93fc33ec6b70c4ed65e82ff0bc383c49ccf39898..2be69c484d21da62b40e8b2073cfdf374f0c9ddc 100644
--- a/supann/locale/hu_HU/fusiondirectory.po
+++ b/supann/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/id/fusiondirectory.po b/supann/locale/id/fusiondirectory.po
index 16438201e63f57a82781489b2e619a49704e3e2e..1216783b5c9aea8ba4095f39878e3960ca4080fb 100644
--- a/supann/locale/id/fusiondirectory.po
+++ b/supann/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +86,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +564,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/it_IT/fusiondirectory.po b/supann/locale/it_IT/fusiondirectory.po
index 7c870c042717e2e4ca9b5ad582c636084a175eef..37d7f529b3ba945d7d057bd58804082ed644e607 100644
--- a/supann/locale/it_IT/fusiondirectory.po
+++ b/supann/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ilaria Montaruli <Ilaria.Montaruli@gmail.com>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-12-31 11:23+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -89,309 +87,331 @@ msgstr "SUPANN"
 msgid "SupAnn information management plugin"
 msgstr "Plugin di gestione delle informazioni SUPANN "
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "IdentitÃ "
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr "CiviltÃ "
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr "supannCivilite - CiviltÃ  per questa persona"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr "Login Alias"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 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:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr "eduPersonPrincipalName"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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"
+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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "Nickname"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr "eduPersonNickname - Puo contenere un diminutivo per questo utente"
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr "Ref ids"
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr "supannRefId - Links ID per questo utente su altri sistemi"
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contatto"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "Altri numeri di telefono"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
-msgstr "supannAutreTelephone - Numeri di telefono alternativi per questo utente"
+msgstr ""
+"supannAutreTelephone - Numeri di telefono alternativi per questo utente"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "Altri indirizzi email"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
-msgstr "supannAutreMail - Indirizzi di posta elettronica alternativi per questo utente. Ognuno deve essere unico"
+msgstr ""
+"supannAutreMail - Indirizzi di posta elettronica alternativi per questo "
+"utente. Ognuno deve essere unico"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "Indirizzi email personali"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
-msgstr "supannMailPerso - Indirizzo di posta elettronica personale di questo utente"
+msgstr ""
+"supannMailPerso - Indirizzo di posta elettronica personale di questo utente"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr "Lista rossa"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr "supannListeRouge - Questa persona dovrebbe trovarsi sulla lista rossa"
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr "Affettazione"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr "Assegnazione di entitÃ  primaria"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
-msgstr "supannEntiteAffectationPrincipale - Assegnazione principale della persona"
+msgstr ""
+"supannEntiteAffectationPrincipale - Assegnazione principale della persona"
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr "Assegnazione entitÃ "
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
-msgstr "supannEntiteAffectation - rappresenta le assegnazioni della persona all'interno di un'istituzione, di un componente, di un servizio, ecc."
+msgstr ""
+"supannEntiteAffectation - rappresenta le assegnazioni della persona "
+"all'interno di un'istituzione, di un componente, di un servizio, ecc."
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr "Assegnazione tipo di identitÃ "
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr "supannTypeEntiteAffectation"
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr "Affiliazione"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr "Affiliazione primaria"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr "eduPersonPrimaryAffiliation - Statuto principale della persona"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr "Affiliazione"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
-msgstr "eduPersonAffiliation - Statuto della persona: studente, BIATOSS, insegnante, contractor, pensionato, personale ospitato (CERN, INSERM, ecc.), un ex studente, ecc."
+msgstr ""
+"eduPersonAffiliation - Statuto della persona: studente, BIATOSS, insegnante,"
+" contractor, pensionato, personale ospitato (CERN, INSERM, ecc.), un ex "
+"studente, ecc."
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr "Immobile"
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
-msgstr "supannEtablissement - Istituzione o unitÃ  amministrativa alla quale Ã© affiliata una persona"
+msgstr ""
+"supannEtablissement - Istituzione o unitÃ  amministrativa alla quale Ã© "
+"affiliata una persona"
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr "Profilo studente"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr "Codice INE"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr "supannCodeINE - codice INE di questo studente"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr "ID studente"
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr "supannEtuId - Numero di matricola"
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr "Sottoscrizioni studente"
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr "supannEtuInscription - Iscrizioni di questo studente"
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
-msgstr "supannEtablissement - Istituzione in cui Ã© stata effettuata l'iscrizione"
+msgstr ""
+"supannEtablissement - Istituzione in cui Ã© stata effettuata l'iscrizione"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "Anno"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr "supannEtuAnneeInscription - Anno in cui l'iscrizione inizierÃ "
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr "Tipo di sottoscrizione"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr "supannEtuRegimeInscription - Tipo d'iscrizione"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr "Settore disciplinare"
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
-msgstr "supannEtuSecteurDisciplinaire - Settore disciplinare del tipo di laurea"
+msgstr ""
+"supannEtuSecteurDisciplinaire - Settore disciplinare del tipo di laurea"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr "Tipo di diploma"
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr "supannEtuTypeDiplome - Tipo di diploma"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr "Anno del curriculum"
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
-msgstr "supannEtuCursusAnnee - tipo di curriculum ( L, D o X , ... ) e l'anno nel diploma ."
+msgstr ""
+"supannEtuCursusAnnee - tipo di curriculum ( L, D o X , ... ) e l'anno nel "
+"diploma ."
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr "supannEntiteAffectation_affettazione"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr "Diploma"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr "supannEtuDiplome - Tipo di Laurea preparata dallo studente"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr "Passo"
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
-msgstr "supannEtuEtape - Step puÃ² essere considerato una scissione ( semestre, anno , ecc ) in tempo di formazione di laurea"
+msgstr ""
+"supannEtuEtape - Step puÃ² essere considerato una scissione ( semestre, anno "
+", ecc ) in tempo di formazione di laurea"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr "Elemento educativo"
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
-msgstr "supannEtuElementPedagogique - Descrizione generica del contenuto di formazione con un alto livello di granularitÃ "
+msgstr ""
+"supannEtuElementPedagogique - Descrizione generica del contenuto di "
+"formazione con un alto livello di granularitÃ "
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr "Profilo personale"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr "ID personale"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr "supannEmpId - identificativo dei dipendenti"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr "Corps personali"
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr "supannEmpCorps"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr "AttivitÃ "
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr "supannActivite - categoria professionale"
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Ruoli"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr "Regole SUPANN dell'entita"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr "Regole generali"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr "supannRoleGenerique - Ruoli generici della persona nella struttura"
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr "Assegnazione tipo di identitÃ "
 
@@ -423,7 +443,9 @@ msgstr "E-mail SUPANN di recupero"
 msgid ""
 "Allow the use of mail addresses from the personal mail address field from "
 "SUPANN account for password recovery"
-msgstr "Consentire l'uso di indirizzi di posta elettronica dal campo mail personali da conto SUPANN per il recupero della password"
+msgstr ""
+"Consentire l'uso di indirizzi di posta elettronica dal campo mail personali "
+"da conto SUPANN per il recupero della password"
 
 #: admin/supannStructures/class_supannStructuresManagement.inc:35
 msgid "Supann structures"
@@ -567,9 +589,8 @@ msgstr "Pagine bianche URI"
 msgid "The URI of this Establishment white pages"
 msgstr "L'URI delle pagine bianche di questo immobile"
 
-#: admin/supannStructures/class_etablissement.inc:149
-#: admin/supannStructures/class_etablissement.inc:200
-#: admin/supannStructures/class_etablissement.inc:214
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
diff --git a/supann/locale/lv/fusiondirectory.po b/supann/locale/lv/fusiondirectory.po
index 5b77c69d2c63a9dee5c34968174252f5026eed19..51cbd9cba7cf4f83dcdf5d799cbc309b279c1f5e 100644
--- a/supann/locale/lv/fusiondirectory.po
+++ b/supann/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Kontakts"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP kÄ¼Å«da"
 
diff --git a/supann/locale/nb/fusiondirectory.po b/supann/locale/nb/fusiondirectory.po
index 70a97bd2e2f85a4ecc51952f0b88ed08772d8950..3f932be2f884a5f40ecca2d8a19c7e18f48564c6 100644
--- a/supann/locale/nb/fusiondirectory.po
+++ b/supann/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
diff --git a/supann/locale/nl/fusiondirectory.po b/supann/locale/nl/fusiondirectory.po
index bff839e8ee1a9db1805c041d5d7b422499d608fa..35ddb74de562b7ecc28eda1b5de30f7f1c3828d2 100644
--- a/supann/locale/nl/fusiondirectory.po
+++ b/supann/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr "Geen"
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "Licence"
-msgstr ""
+msgstr "Licentie"
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "Master"
@@ -32,7 +33,7 @@ msgstr ""
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "Ph.D."
-msgstr ""
+msgstr "Ph.D."
 
 #: personal/supann/class_supannAccount.inc:108
 msgid "Another class of degree"
@@ -86,309 +87,309 @@ msgstr "SUPANN"
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "Identieit"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr "eduPersoonNaam"
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
-msgstr ""
+msgstr "Bijnaam"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contact"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
-msgstr ""
+msgstr "Andere telefoonnummers"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
-msgstr ""
+msgstr "Ander e-mail adres"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
-msgstr ""
+msgstr "Persoonlijk e-mail adres"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
-msgstr ""
+msgstr "Rode lijst"
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr "Affectatie"
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr "supannTypeEntiteitAffectatie"
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr "Affiliatie"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr "Affiliatie"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
-msgstr ""
+msgstr "Studenten profiel"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
-msgstr ""
+msgstr "INE code"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "Jaar"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
-msgstr ""
+msgstr "Diploma"
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
-msgstr ""
+msgstr "Persoonlijke ID"
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr "supannEmpCorps"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
-msgstr ""
+msgstr "Activiteit"
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Rolen"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr "supannRoleEntite"
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -437,7 +438,7 @@ msgstr ""
 #: admin/supannStructures/class_supann.inc:54
 #, php-format
 msgid "Cannot read file: '%s'"
-msgstr ""
+msgstr "Kan het bestand '%s' niet lezen"
 
 #: admin/supannStructures/class_etablissement.inc:32
 msgid "SUPANN Establishment Settings"
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP fout"
 
diff --git a/supann/locale/pl/fusiondirectory.po b/supann/locale/pl/fusiondirectory.po
index 08c87188418b04f933b594ec7e206acf69760b3f..869dac3ab2ac004bfe3b5972234d8b751096c947 100644
--- a/supann/locale/pl/fusiondirectory.po
+++ b/supann/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Kontakt"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "bÅ‚Ä…d LDAP"
 
diff --git a/supann/locale/pt/fusiondirectory.po b/supann/locale/pt/fusiondirectory.po
index 5bb14dda7c07f425e6025e7edf9507695f34850b..8b97ac2a849f905d06aae40d2f5086e9393d2b6a 100644
--- a/supann/locale/pt/fusiondirectory.po
+++ b/supann/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
diff --git a/supann/locale/pt_BR/fusiondirectory.po b/supann/locale/pt_BR/fusiondirectory.po
index c9ea41828761c9ea95a1b9faefa9ad28f46d097e..b06d4818087e32574f60a98724f26192ea595366 100644
--- a/supann/locale/pt_BR/fusiondirectory.po
+++ b/supann/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr "Identidade"
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr "Login de alias"
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr "Apelido"
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "Contato"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr "Outros nÃºmeros de telefone"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr "Outro endereÃ§o de email"
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr "EndereÃ§os pessoais de correio"
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr "AfiliaÃ§Ã£o"
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr "AfiliaÃ§Ãµes"
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr "Perfil de estudante"
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr "Ano"
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr "Tipo de inscriÃ§Ã£o"
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "AtribuiÃ§Ãµes"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
diff --git a/supann/locale/ru/fusiondirectory.po b/supann/locale/ru/fusiondirectory.po
index bbea97e48df8e56f25abcd13698055225c9d3275..4bffc188826ffea8136e5a8343d85d18b6e4a581 100644
--- a/supann/locale/ru/fusiondirectory.po
+++ b/supann/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr "Ð Ð¾Ð»Ð¸"
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
 
diff --git a/supann/locale/ru@petr1708/fusiondirectory.po b/supann/locale/ru@petr1708/fusiondirectory.po
index 4f961a97090debeb1b87bdf5a99cb23d1ba62d29..a124f0abfa3732560d4edd0f433f271a26f3d761 100644
--- a/supann/locale/ru@petr1708/fusiondirectory.po
+++ b/supann/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +86,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +564,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/sv/fusiondirectory.po b/supann/locale/sv/fusiondirectory.po
index 9bc51a1b130f8537ac31fd5b2a8ecb787eeb8522..5fe82d4d226c6feeedfe5d206dacabf39eb577e7 100644
--- a/supann/locale/sv/fusiondirectory.po
+++ b/supann/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP-fel"
 
diff --git a/supann/locale/ug/fusiondirectory.po b/supann/locale/ug/fusiondirectory.po
index 4eaab01d7f62a8b3951cc2520d7d3055cbc05339..bef940a6df0f797ebeffd7ce3a4cde27954dfcba 100644
--- a/supann/locale/ug/fusiondirectory.po
+++ b/supann/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +86,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +564,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr ""
 
diff --git a/supann/locale/vi_VN/fusiondirectory.po b/supann/locale/vi_VN/fusiondirectory.po
index ea3e465c526b954a29eb61b87a53f0427fb13eef..1366a10be9f61619766209f5086feb92e89e6abe 100644
--- a/supann/locale/vi_VN/fusiondirectory.po
+++ b/supann/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
diff --git a/supann/locale/zh/fusiondirectory.po b/supann/locale/zh/fusiondirectory.po
index 0ff976b9240646ae2b53b58c3fca06ab526ead48..1c1a066114f13abed3dc242bf8930fbd81a5fb37 100644
--- a/supann/locale/zh/fusiondirectory.po
+++ b/supann/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,309 +87,309 @@ msgstr ""
 msgid "SupAnn information management plugin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:233
+#: personal/supann/class_supannAccount.inc:234
 msgid "Identity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "Civilite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:236
+#: personal/supann/class_supannAccount.inc:237
 msgid "supannCivilite - Civility for this person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "Alias login"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:241
+#: personal/supann/class_supannAccount.inc:242
 msgid "supannAliasLogin - An alias for the login of this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 msgid "eduPersonPrincipalName"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:245
+#: personal/supann/class_supannAccount.inc:246
 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:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "Nick name"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:249
+#: personal/supann/class_supannAccount.inc:250
 msgid "eduPersonNickname - Can contain a nick name for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "Ref ids"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:254
+#: personal/supann/class_supannAccount.inc:255
 msgid "supannRefId - IDs/links for this user on other systems"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:264
+#: personal/supann/class_supannAccount.inc:265
 msgid "Contact"
 msgstr "è”ç³»"
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "Other phone numbers"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:268
+#: personal/supann/class_supannAccount.inc:269
 msgid "supannAutreTelephone - Other phone numbers for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid "Other mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:274
+#: personal/supann/class_supannAccount.inc:275
 msgid ""
 "supannAutreMail - Other mail addresses for this user. Each must be unique"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "Personal mail addresses"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:280
+#: personal/supann/class_supannAccount.inc:281
 msgid "supannMailPerso - Personal mail addresses for this user"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "red List"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:285
+#: personal/supann/class_supannAccount.inc:286
 msgid "supannListeRouge - Should this person be on the red list"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:291
+#: personal/supann/class_supannAccount.inc:292
 msgid "Affectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "Entity primary assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:294
+#: personal/supann/class_supannAccount.inc:295
 msgid "supannEntiteAffectationPrincipale - Main assignment of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:390
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:391
+#: personal/supann/class_supannAccount.inc:455
 msgid "Entity assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:299
-#: personal/supann/class_supannAccount.inc:452
+#: personal/supann/class_supannAccount.inc:300
+#: personal/supann/class_supannAccount.inc:455
 msgid ""
 "supannEntiteAffectation - represents assignments of the person in an "
 "institution, a component, service, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
+#: personal/supann/class_supannAccount.inc:306
 msgid "Entity type assignment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:305
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:306
+#: personal/supann/class_supannAccount.inc:451
 msgid "supannTypeEntiteAffectation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:312
+#: personal/supann/class_supannAccount.inc:313
 msgid "Affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "Primary affiliation"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:315
+#: personal/supann/class_supannAccount.inc:316
 msgid "eduPersonPrimaryAffiliation - Main status of the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid "Affiliations"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:320
+#: personal/supann/class_supannAccount.inc:321
 msgid ""
 "eduPersonAffiliation - status of the person: student, BIATOSS, teacher, "
 "contract, retired, hosted staff (CNRS, INSERM, etc.), a former student, etc."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:327
+#: personal/supann/class_supannAccount.inc:366
 #: admin/supannStructures/class_etablissement.inc:31
 msgid "Establishment"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:326
+#: personal/supann/class_supannAccount.inc:327
 msgid ""
 "supannEtablissement - institution or unit of administrative attachment of "
 "the person"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:333
+#: personal/supann/class_supannAccount.inc:334
 msgid "Student profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "INE code"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:336
+#: personal/supann/class_supannAccount.inc:337
 msgid "supannCodeINE - INE code of this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "Student ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:340
+#: personal/supann/class_supannAccount.inc:341
 msgid "supannEtuId - Scolarity id"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:346
+#: personal/supann/class_supannAccount.inc:347
 msgid "Student subscriptions"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:361
+#: personal/supann/class_supannAccount.inc:362
 msgid "supannEtuInscription - Subscriptions for this student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:365
+#: personal/supann/class_supannAccount.inc:366
 msgid ""
 "supannEtablissement - Etablissement in which this subscription was done"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "Year"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:369
+#: personal/supann/class_supannAccount.inc:370
 msgid "supannEtuAnneeInscription - The year this subscription will begin"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "Subscription type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:374
+#: personal/supann/class_supannAccount.inc:375
 msgid "supannEtuRegimeInscription - The type of this subscription"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "Disciplinary Sector"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:378
+#: personal/supann/class_supannAccount.inc:379
 msgid "supannEtuSecteurDisciplinaire - Disciplinary sector education diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "Diploma type"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:382
+#: personal/supann/class_supannAccount.inc:383
 msgid "supannEtuTypeDiplome - Type of diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid "Curriculum year "
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:386
+#: personal/supann/class_supannAccount.inc:387
 msgid ""
 "supannEtuCursusAnnee - type of curriculum (L, M, D or X, ...) and the year "
 "in the diploma."
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:390
+#: personal/supann/class_supannAccount.inc:391
 msgid "supannEntiteAffectation_affect"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "Diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:394
+#: personal/supann/class_supannAccount.inc:395
 msgid "supannEtuDiplome - Diploma prepared by the student"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid "Step"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:398
+#: personal/supann/class_supannAccount.inc:399
 msgid ""
 "supannEtuEtape - Step can be considered a split (semester, year, etc.) in "
 "time of education leading to a diploma"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid "educational element"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:402
+#: personal/supann/class_supannAccount.inc:403
 msgid ""
 "supannEtuElementPedagogique - Generic description of the content of "
 "education with a high level of granularity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:414
+#: personal/supann/class_supannAccount.inc:417
 msgid "Personal profile"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "Personal ID"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:417
+#: personal/supann/class_supannAccount.inc:420
 msgid "supannEmpId - Employee identifier"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "Personal corps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:421
+#: personal/supann/class_supannAccount.inc:424
 msgid "supannEmpCorps"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "Activity"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:426
+#: personal/supann/class_supannAccount.inc:429
 msgid "supannActivite - category of profession"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:433
+#: personal/supann/class_supannAccount.inc:436
 msgid "Roles"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:440
+#: personal/supann/class_supannAccount.inc:443
 msgid "supannRoleEntite"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "Generic role"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:444
+#: personal/supann/class_supannAccount.inc:447
 msgid "supannRoleGenerique - Generics Roles of the person in the facility"
 msgstr ""
 
-#: personal/supann/class_supannAccount.inc:448
+#: personal/supann/class_supannAccount.inc:451
 msgid "Entity assignment type"
 msgstr ""
 
@@ -564,9 +565,8 @@ msgstr ""
 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
+#: admin/supannStructures/class_etablissement.inc:152
+#: admin/supannStructures/class_etablissement.inc:218
 msgid "LDAP error"
 msgstr "LDAP é”™è¯¯"
 
diff --git a/supann/personal/supann/class_supannAccount.inc b/supann/personal/supann/class_supannAccount.inc
index f9c5cf17b4131fb29fa5ec0c7d2813495fa56e4b..770f5628f3c29858ad1346b3e5204241c5792f7e 100644
--- a/supann/personal/supann/class_supannAccount.inc
+++ b/supann/personal/supann/class_supannAccount.inc
@@ -225,6 +225,7 @@ class supannAccount extends simplePlugin
     );
   }
 
+  // The main function : information about attributes
   static function getAttributesInfo ()
   {
     $year = intval(date('Y'));
@@ -254,7 +255,7 @@ class supannAccount extends simplePlugin
               _('Ref ids'), _('supannRefId - IDs/links for this user on other systems'),
               'supannRefId', FALSE,
               '', '',
-              /* Validation regexp: it must have a prefix */
+               // Validation regexp: it must have a prefix
               '/^{[^}]+}.+$/'
             )
           ),
@@ -404,8 +405,10 @@ class supannAccount extends simplePlugin
                 ),
               )
             ),
+            // no order
             FALSE,
             array(),
+            // no edit button
             FALSE
           )
         )
@@ -454,10 +457,13 @@ class supannAccount extends simplePlugin
                 ),
               ),
               '',
+              // no label
               ''
             ),
+            // no order
             FALSE,
             array(),
+            // no edit button
             FALSE
           )
         )
@@ -511,16 +517,13 @@ class supannAccount extends simplePlugin
     $this->attributesAccess['supannEtuInscription']->setLinearRendering(FALSE);
 
     list ($codes, $labels) = supann::get_choices_for('eturegimeinscription_SISE', '{SISE}');
-    /* supannEtuRegimeInscription */
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[2]->setChoices($codes, $labels);
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[2]->setChoices($codes, $labels); // supannEtuRegimeInscription
 
     list ($codes, $labels) = supann::get_choices_for('discipline_SISE', '{SISE}');
-    /* supannEtuSecteurDisciplinaire */
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[3]->setChoices($codes, $labels);
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[3]->setChoices($codes, $labels); // supannEtuSecteurDisciplinaire
 
     list ($codes, $labels) = supann::get_choices_for('typediplome_SISE', '{SISE}');
-    /* supannEtuTypeDiplome */
-    $this->attributesAccess['supannEtuInscription']->attribute->attributes[4]->setChoices($codes, $labels);
+    $this->attributesAccess['supannEtuInscription']->attribute->attributes[4]->setChoices($codes, $labels); // supannEtuTypeDiplome
 
     list ($codes, $labels) = supann::get_choices_for('corps', '{NCORPS}');
     $this->attributesAccess['supannEmpCorps']->setChoices($codes, $labels);
@@ -538,15 +541,15 @@ class supannAccount extends simplePlugin
     );
     $code_etab   = $this->attributesAccess['supannEtablissement']->getValue();
     $label_etab  = $this->attributesAccess['supannEtablissement']->getDisplayValues();
-    /* supannEtablissement */
+    // supannEtablissement
     $this->attributesAccess['supannEtuInscription']->attribute->attributes[0]->setChoices($code_etab, $label_etab);
-    /* supannEntiteAffectation */
+    // supannEntiteAffectation
     $this->attributesAccess['supannEtuInscription']->attribute->attributes[6]->setChoices($code_ent, $label_ent);
-    /* supannEntiteAffectation */
+    // supannEntiteAffectation
     $this->attributesAccess['supannRoleEntite']->attribute->attributes[2]->setChoices($code_ent, $label_ent);
     $code_tent   = $this->attributesAccess['supannTypeEntiteAffectation']->getValue();
     $label_tent  = $this->attributesAccess['supannTypeEntiteAffectation']->getDisplayValues();
-    /* supannTypeEntiteAffectation */
+    // supannTypeEntiteAffectation
     $this->attributesAccess['supannRoleEntite']->attribute->attributes[1]->setChoices($code_tent, $label_tent);
 
     $this->attributesAccess['eduPersonPrimaryAffiliation']->setChoices(
diff --git a/sympa/locale/ar/fusiondirectory.po b/sympa/locale/ar/fusiondirectory.po
index b8e2c9ee27fbe625c62bfab19aaf17398c2699f6..f6eaeac28a75567dcf0f2791ae4cedd3394cecf5 100644
--- a/sympa/locale/ar/fusiondirectory.po
+++ b/sympa/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ca/fusiondirectory.po b/sympa/locale/ca/fusiondirectory.po
index 9f0785d7bf8bf310586b347c7d887c2296bcc1c1..823433f0f4d297d13402c639ad2b8f43a0c20a06 100644
--- a/sympa/locale/ca/fusiondirectory.po
+++ b/sympa/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/cs_CZ/fusiondirectory.po b/sympa/locale/cs_CZ/fusiondirectory.po
index 4309a495af9be20550069f93b38628de9b7d7a22..a51309477673b3abafcffe452d850564f23fd231 100644
--- a/sympa/locale/cs_CZ/fusiondirectory.po
+++ b/sympa/locale/cs_CZ/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Pavel Borecki <pavel.borecki@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr "AlternativnÃ nÃ¡zev Sympa seznamu"
 
 #: admin/sympa/class_sympaAlias.inc:53
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
 #: admin/sympa/class_sympaAlias.inc:53
 msgid "Name to identify this alias"
@@ -33,7 +33,7 @@ msgstr "NÃ¡zev pro identifikaci tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Description of this alias"
@@ -41,7 +41,7 @@ msgstr "Popis tohoto alternativnÃho nÃ¡zvu"
 
 #: admin/sympa/class_sympaAlias.inc:60
 msgid "Email address"
-msgstr "E-mailovÃ¡ adresa"
+msgstr "e-mailovÃ¡ adresa"
 
 #: admin/sympa/class_sympaAlias.inc:65
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
@@ -59,11 +59,11 @@ msgstr "Sympa Server"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL"
-msgstr "URL adresa"
+msgstr "URL"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL to access the sympa server"
@@ -71,7 +71,7 @@ msgstr "URL adresa pro pÅ™Ãstup k sympa serveru"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User"
-msgstr "UÅ¾ivatel"
+msgstr "uÅ¾ivatel"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User to access sympa server SOAP API."
@@ -79,7 +79,7 @@ msgstr "UÅ¾ivatelskÃ½ ÃºÄet, kterÃ½m pÅ™istupovat k SOAP API rozhranÃ na serve
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password"
-msgstr "Heslo"
+msgstr "heslo"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password to access sympa server SOAP API."
diff --git a/sympa/locale/de/fusiondirectory.po b/sympa/locale/de/fusiondirectory.po
index f2aaf18d562a2c5cc47678a7eb873ebb9cb5c477..5dfd0a40b4576c9ad412fe8785044680cc3ba338 100644
--- a/sympa/locale/de/fusiondirectory.po
+++ b/sympa/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +29,7 @@ msgstr "Name"
 
 #: admin/sympa/class_sympaAlias.inc:53
 msgid "Name to identify this alias"
-msgstr "Name, um dieses Alias zu identifizieren"
+msgstr "Name um dieses Alias zu identifizieren"
 
 #: admin/sympa/class_sympaAlias.inc:55
 msgid "Description"
@@ -55,7 +55,7 @@ msgstr "Samba-Server fÃ¼r dieses Alias"
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Sympa Server"
-msgstr "Sympa-Server"
+msgstr "Sympa Server"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Services"
@@ -67,7 +67,7 @@ msgstr "URL"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL to access the sympa server"
-msgstr "URL zum Zugriff auf den Sympa-Server"
+msgstr "URL um auf den sympa-Server zuzugreifen"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User"
@@ -75,7 +75,7 @@ msgstr "Benutzer"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User to access sympa server SOAP API."
-msgstr "Benutzer, um auf die Sympa-Server-SOAP-API zuzugreifen."
+msgstr "Benutzer um auf die sympa-Server SOAP API zuzugreifen."
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password"
@@ -83,4 +83,4 @@ msgstr "Passwort"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password to access sympa server SOAP API."
-msgstr "Passwort, um auf die Sympaserver-SOAP-API zuzugreifen."
+msgstr "Passwort um auf die sympa-Server SOAP API zuzugreifen."
diff --git a/sympa/locale/el_GR/fusiondirectory.po b/sympa/locale/el_GR/fusiondirectory.po
index 87560030f17876a4a1fadad08c034e4380560a14..dfc3aa26a65bd6709660aab8e48b4ef58df724fd 100644
--- a/sympa/locale/el_GR/fusiondirectory.po
+++ b/sympa/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Manolis Saldaris <Ustramator@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/en/fusiondirectory.po b/sympa/locale/en/fusiondirectory.po
index 4ec2d0ebb8cb477b298654b827a513aea2dd53a8..e9fe02f78ec814636dcaebe460798cb77f2fbde2 100644
--- a/sympa/locale/en/fusiondirectory.po
+++ b/sympa/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
diff --git a/sympa/locale/es/fusiondirectory.po b/sympa/locale/es/fusiondirectory.po
index 7eb992eaf541af4b3ada1f67d9b893da3397b89a..7129583c1611a9b8f70d103d80bbfe1e1f6e3eb3 100644
--- a/sympa/locale/es/fusiondirectory.po
+++ b/sympa/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/es_CO/fusiondirectory.po b/sympa/locale/es_CO/fusiondirectory.po
index cb3953b3282bb8e2e30bb013332afd0018c8dae9..594d4005424e04a9d25ad258f070ebaea59d7d7f 100644
--- a/sympa/locale/es_CO/fusiondirectory.po
+++ b/sympa/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/es_VE/fusiondirectory.po b/sympa/locale/es_VE/fusiondirectory.po
index 73cc66cf1c3500cc15810d2bb8e976fcaedb028e..aab3977ce50c79981f5348afe2caf096d2656c8f 100644
--- a/sympa/locale/es_VE/fusiondirectory.po
+++ b/sympa/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/fa_IR/fusiondirectory.po b/sympa/locale/fa_IR/fusiondirectory.po
index b3f55e8475337375b5f6c1d0f60380b997271623..9c9fb32ca4cadba826cd1a0e89dee156f0ad9dd6 100644
--- a/sympa/locale/fa_IR/fusiondirectory.po
+++ b/sympa/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/fi_FI/fusiondirectory.po b/sympa/locale/fi_FI/fusiondirectory.po
index 7b46b47d5d75d5132bab9091276df79621cb8a49..d5b8876ecfdc829bec866fb160420fae28f7501f 100644
--- a/sympa/locale/fi_FI/fusiondirectory.po
+++ b/sympa/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/fr/fusiondirectory.po b/sympa/locale/fr/fusiondirectory.po
index 87e2f7510a149db1d1436cea2785e39bdd93f705..0283f09197ef2d06cc9350f5b83a0252d8460701 100644
--- a/sympa/locale/fr/fusiondirectory.po
+++ b/sympa/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +21,7 @@ msgstr ""
 #: admin/sympa/class_sympaAlias.inc:29 admin/sympa/class_sympaAlias.inc:30
 #: admin/sympa/class_sympaAlias.inc:33 admin/sympa/class_sympaAlias.inc:50
 msgid "Sympa list alias"
-msgstr "Alias de liste sympa"
+msgstr "Liste des alias sympa"
 
 #: admin/sympa/class_sympaAlias.inc:53
 msgid "Name"
@@ -42,7 +41,7 @@ msgstr "Description de l'alias"
 
 #: admin/sympa/class_sympaAlias.inc:60
 msgid "Email address"
-msgstr "Adresse de courriel"
+msgstr "Adresse de messagerie"
 
 #: admin/sympa/class_sympaAlias.inc:65
 #: admin/systems/services/sympa/class_serviceSympa.inc:46
@@ -51,7 +50,7 @@ msgstr "Serveur sympa"
 
 #: admin/sympa/class_sympaAlias.inc:65
 msgid "Sympa server for this alias"
-msgstr "Serveur sympa pour cet alias"
+msgstr "Serveur Sympa pour cet alias"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
@@ -60,7 +59,7 @@ msgstr "Serveur Sympa"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:49
 msgid "URL"
@@ -76,7 +75,7 @@ msgstr "Utilisateur"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:53
 msgid "User to access sympa server SOAP API."
-msgstr "Utilisateur pour accÃ©der Ã  lâ€™interface SOAP"
+msgstr "Utilisateur pour accÃ©der a l'interface SOAP"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password"
@@ -84,4 +83,4 @@ msgstr "Mot de passe"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:57
 msgid "Password to access sympa server SOAP API."
-msgstr "Mot de passe pour accÃ©der Ã  lâ€™interface SOAP"
+msgstr "Mot de passe pour accÃ©der Ã  l'interface SOAP"
diff --git a/sympa/locale/hu_HU/fusiondirectory.po b/sympa/locale/hu_HU/fusiondirectory.po
index c3c9632944dcbcb340dd308402312e48b5bb0dfd..03a36c7988edb9ae18179d95bff813e829a1da40 100644
--- a/sympa/locale/hu_HU/fusiondirectory.po
+++ b/sympa/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/id/fusiondirectory.po b/sympa/locale/id/fusiondirectory.po
index e0463f0c1fb702559bb51e86e1cc75b4046624aa..f62de768de5ba2010b7267cc97bceac3fa341cfe 100644
--- a/sympa/locale/id/fusiondirectory.po
+++ b/sympa/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/it_IT/fusiondirectory.po b/sympa/locale/it_IT/fusiondirectory.po
index 40fac868a3862fba5d46bb3662c67e3fc3cb32b0..b5800ac603206b9d729bbeb6b4158f03ab1def16 100644
--- a/sympa/locale/it_IT/fusiondirectory.po
+++ b/sympa/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/lv/fusiondirectory.po b/sympa/locale/lv/fusiondirectory.po
index f5fd02dce42f6875ce713a077d16957144c930b2..f026c6118e53b9420c215a5b56fd44e983b51476 100644
--- a/sympa/locale/lv/fusiondirectory.po
+++ b/sympa/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/nb/fusiondirectory.po b/sympa/locale/nb/fusiondirectory.po
index 326730c701d50c6a3ee3d7a29debd0afefa1610c..ea7cc05a7421f8a6c35d4b74b1e19eec173482ed 100644
--- a/sympa/locale/nb/fusiondirectory.po
+++ b/sympa/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/nl/fusiondirectory.po b/sympa/locale/nl/fusiondirectory.po
index e5b1da1af4d4651806a664e2d5a8d35f74964c5b..2134a085f112439bb5661c8a907a7c07dccb6e25 100644
--- a/sympa/locale/nl/fusiondirectory.po
+++ b/sympa/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,7 +50,7 @@ msgstr "Sympa server"
 
 #: admin/sympa/class_sympaAlias.inc:65
 msgid "Sympa server for this alias"
-msgstr ""
+msgstr "Sympa server voor deze alias"
 
 #: admin/systems/services/sympa/class_serviceSympa.inc:31
 #: admin/systems/services/sympa/class_serviceSympa.inc:32
diff --git a/sympa/locale/pl/fusiondirectory.po b/sympa/locale/pl/fusiondirectory.po
index 029e0d4912a7cc0160099ba3d59a1b786453d374..3c9915013780b1447a35f2dc6756310f8c2e3672 100644
--- a/sympa/locale/pl/fusiondirectory.po
+++ b/sympa/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/pt/fusiondirectory.po b/sympa/locale/pt/fusiondirectory.po
index abe562ac4ec3af8f0e25fca22f6fe5c9ac127a0d..34368ee759416f94815c41b3cd3f10a345ce7c9f 100644
--- a/sympa/locale/pt/fusiondirectory.po
+++ b/sympa/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/pt_BR/fusiondirectory.po b/sympa/locale/pt_BR/fusiondirectory.po
index b7581e455f49a9cd081363f9066698418ca0f766..86fca86c9160ae06bc7be36cbcb5a4a5d11985e6 100644
--- a/sympa/locale/pt_BR/fusiondirectory.po
+++ b/sympa/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ru/fusiondirectory.po b/sympa/locale/ru/fusiondirectory.po
index b0ed0313437527d5ed91e9b7795c0b72f3d136b6..aa6dadb8f4078d10e7f6c9c0e31531bcb5887655 100644
--- a/sympa/locale/ru/fusiondirectory.po
+++ b/sympa/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ru@petr1708/fusiondirectory.po b/sympa/locale/ru@petr1708/fusiondirectory.po
index a28499d5477a55c86f178bbed2c392c7be8bac7f..a9c5e55785cde56f18337633f65f3266fb2f1ceb 100644
--- a/sympa/locale/ru@petr1708/fusiondirectory.po
+++ b/sympa/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/sv/fusiondirectory.po b/sympa/locale/sv/fusiondirectory.po
index a6222de72ca43a16516ce93e8cd86460d5da3d3e..387cc78133db7448e12c86c5232a56e835812e16 100644
--- a/sympa/locale/sv/fusiondirectory.po
+++ b/sympa/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/ug/fusiondirectory.po b/sympa/locale/ug/fusiondirectory.po
index 3ad549edf6a952f7c5aa32e86e244ffd200734cc..2ca258e7d2d3f1428864699346b8517762256115 100644
--- a/sympa/locale/ug/fusiondirectory.po
+++ b/sympa/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/vi_VN/fusiondirectory.po b/sympa/locale/vi_VN/fusiondirectory.po
index cbdae0ee2d5eb713ea0d52a6cbc74c3663fe437e..b9209fdd33269e71fe0ce9fcbabdbbfcaa354d6e 100644
--- a/sympa/locale/vi_VN/fusiondirectory.po
+++ b/sympa/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/sympa/locale/zh/fusiondirectory.po b/sympa/locale/zh/fusiondirectory.po
index e53a092f1bf8826dbdd9bee37e52540567bf7ced..4aeadff34a413ebf9bb71a369ca7cfa181f40391 100644
--- a/sympa/locale/zh/fusiondirectory.po
+++ b/sympa/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/systems/addons/dashboard/class_dashBoardNetwork.inc b/systems/addons/dashboard/class_dashBoardNetwork.inc
index 14bc373d2f06c367bbeb80c607981b510d97b826..6cb5059a734e5c592eb1bb33f74a7cfe55b418b0 100644
--- a/systems/addons/dashboard/class_dashBoardNetwork.inc
+++ b/systems/addons/dashboard/class_dashBoardNetwork.inc
@@ -99,7 +99,6 @@ class dashboardNetwork extends simplePlugin
 
   function dns_infos()
   {
-    global $config;
     if (!class_available('dnsZone')) {
       return array();
     }
diff --git a/systems/addons/dashboard/class_dashBoardSystems.inc b/systems/addons/dashboard/class_dashBoardSystems.inc
index dec5f8c6802f24504dbaf51d70206342ea57b53f..1a2027a382a111577404f6b966f26ae1e7c493f1 100644
--- a/systems/addons/dashboard/class_dashBoardSystems.inc
+++ b/systems/addons/dashboard/class_dashBoardSystems.inc
@@ -21,6 +21,7 @@
 
 class dashboardSystems extends simplePlugin
 {
+  /* default values */
   var $default_start_computer_id = 0;
 
   static function plInfo()
@@ -65,40 +66,50 @@ class dashboardSystems extends simplePlugin
   {
     global $config;
     $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
 
     /* Statistics */
     $stats = array(
-      array('name' => _('Workstations'),
-            'filter' => 'objectClass=gotoWorkstation',
-            'img' => 'geticon.php?context=devices&icon=computer&size=16'),
-      array('name' => _('Servers'),
-            'filter' => 'objectClass=goServer',
-            'img' => 'geticon.php?context=devices&icon=server&size=16'),
-      array('name' => _('Windows Workstations'),
-            'filter' => '(&(objectClass=sambaSamAccount)(uid=*$))',
-            'img' => 'geticon.php?context=devices&icon=computer-windows&size=16'),
-      array('name' => _('Terminals'),
-            'filter' => 'objectClass=gotoTerminal',
-            'img' => 'geticon.php?context=devices&icon=terminal&size=16'),
-      array('name' => _('Printers'),
-            'filter' => 'objectClass=fdPrinter',
-            'img' => 'geticon.php?context=devices&icon=printer&size=16'),
-      array('name' => _('Phones'),
-            'filter' => 'objectClass=fdPhone',
-            'img' => 'geticon.php?context=devices&icon=telephone&size=16'),
-      array('name' => _('Components'),
-            'filter' => 'objectClass=ieee802Device',
-            'img' => 'geticon.php?context=devices&icon=network-device&size=16'),
-      array('name' => _('Mobile phones'),
-            'filter' => 'objectClass=fdMobilePhone',
-            'img' => 'geticon.php?context=devices&icon=phone&size=16'),
+      array('name'  => _('Workstations'),
+            'type'  => 'workstation',
+            'img'   => 'geticon.php?context=devices&icon=computer&size=16'
+      ),
+      array('name'  => _('Servers'),
+            'type'  => 'server',
+            'img'   => 'geticon.php?context=devices&icon=server&size=16'
+      ),
+      array('name'    => _('Windows Workstations'),
+            'filter'  => '(&(objectClass=sambaSamAccount)(uid=*$))',
+            'img'     => 'geticon.php?context=devices&icon=computer-windows&size=16'
+      ),
+      array('name'  => _('Terminals'),
+            'type'  => 'terminal',
+            'img'   => 'geticon.php?context=devices&icon=terminal&size=16'
+      ),
+      array('name'  => _('Printers'),
+            'type'  => 'printer',
+            'img'   => 'geticon.php?context=devices&icon=printer&size=16'
+      ),
+      array('name'  => _('Phones'),
+            'type'  => 'phone',
+            'img'   => 'geticon.php?context=devices&icon=telephone&size=16'
+      ),
+      array('name'  => _('Components'),
+            'type'  => 'component',
+            'img'   => 'geticon.php?context=devices&icon=network-device&size=16'
+      ),
+      array('name'  => _('Mobile phones'),
+            'type'  => 'mobilePhone',
+            'img'   => 'geticon.php?context=devices&icon=phone&size=16'),
     );
 
-    $ldap->cd($config->current['BASE']);
     foreach ($stats as &$stat) {
-      $ldap->search($stat['filter'], array("cn"));
-      $stat['nb'] = $ldap->count();
+      if (isset($stat['filter'])) {
+        $ldap->cd($config->current['BASE']);
+        $ldap->search($stat['filter'], array("cn"));
+        $stat['nb'] = $ldap->count();
+      } else {
+        $stat['nb'] = objects::count($stat['type']);
+      }
     }
     unset($stat);
 
@@ -152,10 +163,7 @@ class dashboardSystems extends simplePlugin
       $computer_ids_rules = array($computer_ids_rules);
     }
 
-    /* $get_cfg_value return the OU like ou=computer .. */
-    /* FIXME use get_ou */
-    $winstation_ou  = mb_substr($config->get_cfg_value('sambaMachineAccountRDN'), 3);
-    $nb_digits      = $config->get_cfg_value('dashboardNumberOfDigit', 3);
+    $nb_digits = $config->get_cfg_value('dashboardNumberOfDigit', 3);
 
     /* running all the table */
     foreach ($computer_ids_rules as $rule) {
@@ -184,7 +192,7 @@ class dashboardSystems extends simplePlugin
       }
 
       /* request of all computer beginning by the prefix */
-      $request = "(&(|(objectClass=sambaSamAccount)(objectClass=GOhard))(cn=$prefix*)(|(ou:dn:=$winstation_ou)(ou:dn:=systems)))";
+      $request = '(&(cn='.$prefix.'*)(ou:dn:=systems))';
       $ldap->search($request, array("cn"));
       while ($attrs = $ldap->fetch()) {
         /* if a computer is a windows host, we have to delete the $ at the end */
diff --git a/systems/addons/dashboard/systems_stats.tpl b/systems/addons/dashboard/systems_stats.tpl
index fdb64e57bb182e60052ed296f8a6ceba66c24705..1a3ad67a86016c78a96286af18868c714a7b0959 100644
--- a/systems/addons/dashboard/systems_stats.tpl
+++ b/systems/addons/dashboard/systems_stats.tpl
@@ -14,12 +14,12 @@
       <img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t}There are several argonaut servers! (this is not yet supported){/t}
     {elseif $attributes.stats.argonaut.nb_servers == 1}
       {t escape=none 1=$attributes.stats.argonaut.server.link 2=$attributes.stats.argonaut.server.ipHostNumber 3=$attributes.stats.argonaut.server.argonautProtocol 4=$attributes.stats.argonaut.server.argonautPort}There is an argonaut server running on %1 (%3://%2:%4){/t}<br/>
-      {if $attributes.stats.argonaut.nb_clients >= 1}
+      {if $attributes.stats.argonaut.nb_clients > 0}
         {t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client."}Only one system is configured to run an argonaut client.{/t}<br/>
       {else}
         {t}But no system is configured to run an argonaut client!{/t}<br/>
       {/if}
-    {elseif $attributes.stats.argonaut.nb_clients >= 1}
+    {elseif $attributes.stats.argonaut.nb_clients > 0}
       <img src="geticon.php?context=status&icon=dialog-warning&size=16" style="vertical-align:middle;margin-right:3px;" alt="warning"/>{t count=$attributes.stats.argonaut.nb_clients 1=$attributes.stats.argonaut.nb_clients plural="%1 systems are configured to run an argonaut client, but there is no argonaut server configured!"}A system is configured to run an argonaut client, but there is no argonaut server configured!{/t}<br/>
     {/if}
   </div>
diff --git a/systems/admin/ogroups/goto/class_termgroup.inc b/systems/admin/ogroups/goto/class_termgroup.inc
deleted file mode 100644
index 81602dbd2fefb477c11a7a386cd2d9df2ddc96cd..0000000000000000000000000000000000000000
--- a/systems/admin/ogroups/goto/class_termgroup.inc
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003-2010  Cajus Pollmeier
-  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 termgroup extends plugin
-{
-  /* attribute list for save action */
-  var $members= array();
-
-  /* Stores a list of the member dn's */
-  var $member_dn = array();
-
-  var $gotoMode     = "locked";
-  var $gotoTerminalPath   = array();
-  var $gotoSwapServer   = array();
-  var $modes      = array();
-  var $is_account   = true;
-  var $orig_dn      = "";
-  var $didAction    = FALSE;
-  var $mapActions   = array("halt"            => "halt",
-                                "reboot"          => "reboot",
-                                "update"          => "update",
-                                "reinstall"       => "reinstall",
-                                "wake"            => "wakeup",
-         /* These are currently not supported by the tftp daemon
-                                "memcheck"        => "memcheck",
-                                "sysinfo"         => "sysinfo" */
-         );
-
-  var $attributes     = array("gotoMode", "gotoTerminalPath", "gotoSwapServer");
-  var $objectclasses  = array("gotoWorkstationTemplate");
-  var $CopyPasteVars  = array("modes","members");
-  var $view_logged    = FALSE;
-  var $nfsservers     = array();
-  var $swapservers    = array();
-  var $member_of_ogroup= false;
-  var $members_inherit_from_group = false;
-
-  function __construct ($dn= NULL, $parent= NULL)
-  {
-    global $config;
-    /***************
-      Some  initialisations
-     ***************/
-
-    parent::__construct($dn, $parent);
-    $ldap = $config->get_ldap_link();
-
-    $this->is_account = true;
-    $this->modes["active"]= _("Activated");
-    $this->modes["locked"]= _("Locked");
-//    $this->modes["memcheck"]= _("Memory test");
-//    $this->modes["sysinfo"]= _("System analysis");
-
-    $this->orig_dn =  $this->dn;
-
-    /***************
-      Get mac addresses from member objects
-     ***************/
-
-    /* We're only interested in the terminal members here, evaluate
-       these... */
-    if(isset($this->attrs['member'])){
-      for ($i= 0; $i<$this->attrs['member']['count']; $i++){
-        $member= $this->attrs['member'][$i];
-        array_push($this->member_dn, $member);
-        $ldap->cat($member, array('objectClass', 'macAddress', 'cn'));
-        if ($ldap->success()){
-          $attrs = $ldap->fetch();
-          if (in_array("gotoTerminal", $attrs['objectClass']) ||
-              in_array("gotoWorkstation", $attrs['objectClass'])){
-            if (isset($attrs['macAddress'])){
-              $this->members[$attrs['cn'][0]]= $attrs['macAddress'][0];
-            } else {
-              $this->members[$attrs['cn'][0]]= "";
-            }
-          }
-        }
-      }
-    }
-
-    /* Get Share servers */
-    $tmp2 = array();
-    $tmp2['!']= _("Local swap");
-    foreach($config->data['SERVERS']['NBD'] as $server){
-      if($server != "default"){
-        $tmp2[$server]= $server;
-      }else{
-        if($this->member_of_ogroup){
-          $tmp2[$server]="["._("inherited")."]";
-        }
-      }
-    }
-    $this->swapservers= $tmp2;
-
-    $tmp2 = array();
-    foreach($config->data['SERVERS']['NFS'] as $server){
-      if($server != "default"){
-        $tmp2[$server]= $server;
-      }else{
-        if($this->member_of_ogroup){
-          $tmp2[$server]="["._("inherited")."]";
-        }
-      }
-    }
-    $this->nfsservers= $tmp2;
-  }
-
-  function check()
-  {
-     /* Call common method to give check the hook */
-    $message= plugin::check();
-
-    if (!$this->acl_is_createable() && $this->dn == "new"){
-      $message[]= msgPool::permCreate();
-    }
-  }
-
-  function remove_from_parent()
-  {
-    global $config;
-    /* Workstation startup is using gotoWorkstationTemplate too,
-        if we remove this oc all other not manged attributes will cause errors */
-    if(isset($this->attrs['gotoKernelParameters'])){
-      $this->objectclasses = array();
-    }
-
-    /* Remove acc */
-    parent::remove_from_parent();
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($this->orig_dn);
-    $ldap->modify($this->attrs);
-    $this->handle_post_events('remove');
-    logging::log('remove', 'ogroup/'.get_class($this), $this->dn, array_keys($this->attrs), $ldap->get_error());
-  }
-
-
-
-  function execute()
-  {
-    /* Call parent execute */
-    parent::execute();
-
-    if(!$this->view_logged){
-      $this->view_logged = TRUE;
-      logging::log('view', 'ogroup/'.get_class($this), $this->dn);
-    }
-
-
-    /***************
-      Handle requested action
-     ***************/
-
-    /* Watch for events */
-    if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate")) && isset($this->mapActions[$_POST['saction']])) {
-
-      $action = $this->mapActions[$_POST['saction']];
-      if (class_available('argonautAction')) {
-        $events = argonautEventTypes::get_event_types();
-        $macaddresses = array();
-        foreach ($this->members as $cn => $macAddress){
-          $macaddresses[]= $macAddress;
-        }
-
-        if (isset($events[$action])) {
-          $o_queue = new gosaSupportDaemon();
-          $o_queue->append_call($action, $macaddresses, array());
-          if ($o_queue->is_error()) {
-            msg_dialog::display(_("Infrastructure service"),msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
-          }
-        }
-      } else {
-        msg_dialog::display(_("Event error"),
-            sprintf(_("Event '%s' is not available!"),$action),ERROR_DIALOG);
-      }
-    }
-
-    /***************
-      Prepare smarty
-     ***************/
-
-    /* Set government mode */
-    $smarty= get_smarty();
-
-    if (isset($this->parent->by_name['terminalStartup'])){
-      $smarty->assign("is_termgroup", "1");
-    } else {
-      $smarty->assign("is_termgroup", "0");
-    }
-
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $name => $translated) {
-      $smarty->assign($name."ACL",$this->getacl($name));
-    }
-
-    foreach($this->attributes as $attr){
-      $smarty->assign($attr,      $this->$attr);
-    }
-
-    /* Variables */
-    foreach(array("gotoMode") as $val){
-      $smarty->assign($val."_select", $this->$val);
-    }
-
-    $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
-          "instant_update" => _("Instant update"),
-          "update" => _("Scheduled update"),
-          "wake" => _("Wake"),
-          "reinstall" => _("Reinstall"),
-          "memcheck" => _("Memory test"),
-          "sysinfo"  => _("System analysis")));
-
-    $smarty->assign("modes", $this->modes);
-
-    $smarty->assign("nfsservers",     $this->nfsservers);
-    $smarty->assign("swapservers",    $this->swapservers);
-
-    /* Variables */
-    foreach(array("gotoTerminalPath", "gotoSwapServer") as $val){
-      $smarty->assign($val."_select", $this->$val);
-    }
-
-
-    /* Show main page */
-    $smarty->assign("members_inherit_from_group", $this->members_inherit_from_group);
-    return ($smarty->fetch (get_template_path('termgroup.tpl', TRUE, dirname(__FILE__))));
-  }
-
-
-  function save_object()
-  {
-    parent::save_object();
-    /* Set inherit mode */
-    if(isset($_POST['workgeneric_posted'])){
-
-      /* Handle the inherit to members button */
-      $this->members_inherit_from_group = isset($_POST['members_inherit_from_group']);
-    }
-  }
-
-  /* Save to LDAP */
-  function save()
-  {
-    if (isset($this->parent->by_name['terminalStartup'])){
-      $this->objectclasses= array("gotoTerminalTemplate");
-    } else {
-      $this->objectclasses= array("gotoWorkstationTemplate");
-    }
-
-    parent::save();
-
-    /* Tell members to inherit all attributes if the flag is set  */
-    //~ $this->inherit_attributes_to_members();
-
-    /***************
-      Write to ldap
-     ***************/
-
-    /* Write back to ldap */
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($this->dn);
-    $this->cleanup();
-    $ldap->modify ($this->attrs);
-
-    if ($this->initially_was_account) {
-      logging::log('modify', 'ogroup/'.get_class($this), $this->dn, array_keys($this->attrs), $ldap->get_error());
-    } else {
-      logging::log('create', 'ogroup/'.get_class($this), $this->dn, array_keys($this->attrs), $ldap->get_error());
-    }
-
-    if(!$this->didAction){
-      $this->handle_post_events("modify");
-    }
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()), LDAP_ERROR);
-    }
-  }
-
-
-  static function plInfo()
-  {
-    return array(
-      'plShortName'   => _('System'),
-      'plDescription' => _('System group'),
-      'plSelfModify'  => FALSE,
-      'plPriority'    => 5,
-      'plObjectType'  => array('ogroup-workstation', 'ogroup-terminal'),
-
-      'plProvidedAcls'  => array(
-        'gotoMode'          => _('Mode'),
-        'FAIstate'          => _('Action flag'),
-        'gotoTerminalPath'  => _('Root server'),
-        'gotoSwapServer'    => _('Swap server')
-      )
-    );
-  }
-
-  function PrepareForCopyPaste($source)
-  {
-    $source_o = new termgroup ($source['dn']);
-    foreach(array("gotoTerminalPath","gotoSwapServer","gotoMode") as $attr){
-      $this->$attr = $source_o->$attr;
-    }
-  }
-}
-?>
diff --git a/systems/admin/ogroups/goto/termgroup.tpl b/systems/admin/ogroups/goto/termgroup.tpl
deleted file mode 100644
index 9e2781f733ad2f3a4dca0734e61dd9ecd8cd0c74..0000000000000000000000000000000000000000
--- a/systems/admin/ogroups/goto/termgroup.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-<br>
-<b>{t}Warning{/t}:</b> {t}Actions you choose here influence all systems in this object group. Additionally, all values editable here can be inherited by the clients assigned to this object group.{/t}
-<br>
-<br>
-<p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
-<h2><img class="center" alt="" align="middle" src="geticon.php?context=devices&icon=terminal&size=16"> {t}Generic{/t}</h2>
-
-<table width="100%">
-  <tr>
-    <td style="vertical-align:top;border-left:1px solid #A0A0A0;">
-    <!-- Upper right -->
-
-      <table>
-        <tr>
-         <td><label for="gotoMode">{t}Mode{/t}</label></td>
-         <td>
-{render acl=$gotoModeACL}
-          <select name="gotoMode" id="gotoMode" title="{t}Select terminal mode{/t}">
-           {html_options options=$modes selected=$gotoMode_select}
-          </select>
-{/render}
-         </td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        {if $is_termgroup}
-            <tr>
-             <td><LABEL for="gotoTerminalPath">{t}Root server{/t}</LABEL></td>
-             <td>
-        {render acl=$gotoTerminalPathACL}
-              <select name="gotoTerminalPath" id="gotoTerminalPath" title="{t}Select NFS root filesystem to use{/t}">
-               {html_options options=$nfsservers selected=$gotoTerminalPath_select}
-              </select>
-        {/render}
-             </td>
-            </tr>
-            <tr>
-             <td><LABEL for="gotoSwapServer">{t}Swap server{/t}</LABEL></td>
-             <td>
-        {render acl=$gotoSwapServerACL}
-              <select name="gotoSwapServer" id="gotoSwapServer" title="{t}Choose NFS filesystem to place swap files on{/t}">
-               {html_options options=$swapservers selected=$gotoSwapServer_select}
-              </select>
-        {/render}
-             </td>
-            </tr>
-        {/if}
-           </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2>
-      <p class="seperator">&nbsp;</p>
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <!-- Bottom left -->
-
-    </td>
-    <td style="vertical-align:top;border-left:1px solid #A0A0A0;">
-    <!-- Bottom right -->
-
-    </td>
-  </tr>
-</table>
-<input name="workgeneric_posted" value="1" type="hidden">
-
-
-<h2><img class="center" alt="" align="middle" src="geticon.php?context=types&icon=action&size=16"> {t}Action{/t}</h2>
-        <table>
-         <tr>
-          <td>
-{render acl=$FAIstateACL}
-           <select size="1" name="saction" {$FAIstateACL} title="{t}Select action to execute for this terminal{/t}">
-          <option>&nbsp;</option>
-          {html_options options=$actions}
-           </select>
-{/render}
-          </td>
-          <td>
-{render acl=$FAIstateACL}
-           <input type=submit name="action" value="{t}Execute{/t}">
-{/render}
-          </td>
-         </tr>
-        </table>
-
-
-
-
-
diff --git a/systems/admin/systems/class_componentGeneric.inc b/systems/admin/systems/class_componentGeneric.inc
index 1a83b083fc34811f428e32ef5f0f0e0adec13285..a809a361ee88d7a697d641c09535312c8186df08 100644
--- a/systems/admin/systems/class_componentGeneric.inc
+++ b/systems/admin/systems/class_componentGeneric.inc
@@ -19,17 +19,12 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class componentGeneric extends systemSimplePluginGlue
+class componentGeneric extends simplePlugin
 {
-  var $objectclasses = array("top", "device", "ipHost", "ieee802Device");
-
   var $mainTab = TRUE;
 
-  var $netConfigDNS;
-
-  var $preInitAttributes = array('cn', 'networkSettings');
+  var $objectclasses = array("top", "device", "ipHost", "ieee802Device");
 
-  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -72,85 +67,20 @@ class componentGeneric extends systemSimplePluginGlue
       ),
       'network' => array(
         'name'      => _('Network settings'),
-        'attrs'     => array(new NetworkSettingsAttribute()),
-        'template'  => get_template_path('network_section.tpl', TRUE, dirname(__FILE__)),
         'icon'      => 'geticon.php?context=categories&icon=applications-internet&size=16',
+        'attrs'     => array(
+          new IPAttribute(
+            _('IP address'), _('IP address this system uses'),
+            'ipHostNumber', TRUE
+          ),
+          new MacAddressAttribute(
+            _('Mac address'), _('Mac address of this system'),
+            'macAddress', FALSE
+          ),
+        ),
       ),
     );
   }
-
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = NULL)
-  {
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['cn']->setUnique(TRUE);
-  }
-
-  /* Returns the dn of the entry */
-  function compute_dn()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('componentRDN').$this->base;
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-    $this->netConfigDNS->resetCopyInfos();
-  }
-
-  function set_acl_base($base)
-  {
-    plugin::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    plugin::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
-  }
-
-  function remove_from_parent()
-  {
-    global $config;
-    if (!$this->initially_was_account) {
-      return;
-    }
-
-    if ($this->acl_is_removeable()) {
-      $this->netConfigDNS->remove_from_parent();
-
-      parent::remove_from_parent();
-
-      /* Delete references to object groups */
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search("(&(objectClass=gosaGroupOfNames)(member=".ldap_escape_f($this->dn)."))", array("cn"));
-      while ($ldap->fetch()) {
-        $og = new ogroup($ldap->getDN());
-        unset($og->member[$this->dn]);
-        $og->save();
-      }
-    }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    /* If this is a new Object IP & Mac aren't set.
-     * IP & Mac are msut attributes, so we set this values by here. */
-    if ($this->orig_dn == 'new') {
-      $this->attrs['ipHostNumber']  = $this->netConfigDNS->ipHostNumber;
-      $this->attrs['macAddress']    = $this->netConfigDNS->macAddress;
-    }
-
-    parent::ldap_save($cleanup);
-    $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save();
-  }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog);
-  }
 }
+
 ?>
diff --git a/systems/admin/systems/class_filterSYSTEMS.inc b/systems/admin/systems/class_filterSYSTEMS.inc
deleted file mode 100644
index 3935eb7ec57c8c00ec888b8a713b559331edd07e..0000000000000000000000000000000000000000
--- a/systems/admin/systems/class_filterSYSTEMS.inc
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  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 filterSYSTEMS
-{
-
-  static function query($parent, $base, $scope, $filter, $attributes, $category, $objectStorage = array())
-  {
-    global $config;
-
-    $config   = session::global_get('config');
-    $flag     = ($scope == "sub"?GL_SUBSEARCH:0);
-    $entries  = filterSYSTEMS::get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
-
-    foreach ($entries as $key => $entry) {
-      if (in_array('sambaSamAccount', $entry['objectClass']) && preg_match("/\$$/", $entry['cn'][0])) {
-        $entries[$key]['objectClass'][] = 'sambaSamAccount';
-      }
-
-      if (!isset($entry['macAddress'][0]) || ($entry['macAddress'][0] == "-")) {
-        continue;
-      }
-
-      // Detect object states
-      foreach (array('gotoWorkstation','gotoTerminal','goServer') as $type) {
-        if (in_array($type, $entry['objectClass'])) {
-
-          if (isset($entry['gotoMode'][0]) && preg_match("/locked/i", $entry['gotoMode'][0])) {
-            $entries[$key]['objectClass'][] = $type."__IS_LOCKED";
-          } elseif (isset($entry['FAIstate'][0])) {
-            switch (preg_replace('/:.*$/', '', $entry['FAIstate'][0])) {
-              case 'error':
-                $state = '__IS_ERROR';
-                break;
-              case 'installing':
-              case 'install':
-              case 'sysinfo':
-              case 'softupdate':
-              case 'scheduledupdate':
-                $state = '__IS_BUSY';
-                break;
-              default:
-                $state = "";
-            }
-            if (!empty($state)) {
-              $entries[$key]['objectClass'][] = $type.$state;
-            }
-          }
-        }
-      }
-    }
-
-    return $entries;
-  }
-
-
-  static function get_list($parent, $base, $filter, $attributes, $category, $objectStorage, $flags = GL_SUBSEARCH)
-  {
-    $ui     = session::global_get('ui');
-    $config = session::global_get('config');
-
-    // Move to arrays for category and objectStorage
-    if (!is_array($category)) {
-      $category = array($category);
-    }
-
-    // Store in base - i.e. is a rdn value empty?
-    $storeOnBase = ((count($objectStorage) == 1) && empty($objectStorage[0]));
-
-    $method = ($storeOnBase && !($flags & GL_SUBSEARCH))?"ls":"search";
-
-    // Initialize search bases
-    $bases = array();
-
-    // Get list of sub bases to search on
-    if ($storeOnBase) {
-      $bases[$base] = "";
-    } else {
-      foreach ($objectStorage as $oc) {
-        $oc   = preg_replace('/,$/', '', $oc);
-        $tmp  = explode(',', $oc);
-        if (count($tmp) == 1) {
-          preg_match('/([^=]+)=(.*)$/', $oc, $m);
-          if ($flags & GL_SUBSEARCH) {
-            $bases[$base][] = $m[1].":dn:=".$m[2];
-          } else {
-            $bases["$oc,$base"][] = $m[1].":dn:=".$m[2];
-          }
-        } else {
-          // No, there's no \, in pre defined RDN values
-          preg_match('/^([^,]+),(.*)$/', $oc, $matches);
-          preg_match('/([^=]+)=(.*)$/', $matches[1], $m);
-          if ($flags & GL_SUBSEARCH) {
-            $bases[$base][] = $m[1].":dn:=".$m[2];
-          } else {
-            $bases[$matches[2].",$base"][] = $m[1].":dn:=".$m[2];
-          }
-        }
-      }
-    }
-    // Get LDAP link
-    $ldap = $config->get_ldap_link($flags & GL_SIZELIMIT);
-
-    // Do search for every base
-    $result         = array();
-    $limit_exceeded = FALSE;
-    foreach ($bases as $base => $dnFilters) {
-
-      // Break if the size limit is exceeded
-      if ($limit_exceeded) {
-        return $result;
-      }
-
-      // Switch to new base and search
-      if (is_array($dnFilters)) {
-        $dnFilter = "(|";
-        foreach ($dnFilters as $df) {
-          $dnFilter .= "($df)";
-        }
-        $dnFilter .= ")";
-      } else {
-        $dnFilter = "";
-      }
-      $ldap->cd($base);
-      if ($method == "ls") {
-        $ldap->ls("(&$filter$dnFilter)", $base, $attributes);
-      } else {
-        $ldap->search("(&$filter$dnFilter)", $attributes);
-      }
-
-      // Check for size limit exceeded messages for GUI feedback
-      if (preg_match("/size limit/i", $ldap->get_error())) {
-        session::set('limit_exceeded', TRUE);
-        $limit_exceeded = TRUE;
-      }
-
-      /* Crawl through result entries and perform the migration to the
-         result array */
-      while ($attrs = $ldap->fetch()) {
-        $dn = $ldap->getDN();
-
-        /* Convert dn into a printable format */
-        if ($flags & GL_CONVERT) {
-          $attrs["dn"] = convert_department_dn($dn);
-        } else {
-          $attrs["dn"] = $dn;
-        }
-
-        /* Skip ACL checks if we are forced to skip those checks */
-        if ($flags & GL_NO_ACL_CHECK) {
-          $result[] = $attrs;
-        } else {
-          $obj = $parent->headpage->getObjectTypeInfos($dn, $attrs);
-
-          if (isset($obj['category'])) {
-            $o = $obj['category']."/".$obj['class'];
-            if (preg_match("/r/", $ui->get_permissions($dn, $o))) {
-              $result[] = $attrs;
-            }
-          }
-        }
-      }
-
-    }
-
-    return $result;
-  }
-}
-
-?>
diff --git a/systems/admin/systems/class_mobilePhoneGeneric.inc b/systems/admin/systems/class_mobilePhoneGeneric.inc
index f0977982cbe2ec984528d6b51d5c2a64a8170f26..74eaad8393d3f82e82caec49d9210957476f3be4 100644
--- a/systems/admin/systems/class_mobilePhoneGeneric.inc
+++ b/systems/admin/systems/class_mobilePhoneGeneric.inc
@@ -18,18 +18,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class mobilePhoneGeneric extends systemSimplePluginGlue
+class mobilePhoneGeneric extends simplePlugin
 {
   var $mainTab = TRUE;
 
-  var $netConfigDNS;
-
-  var $objectclasses = array("top", "fdMobilePhone");
+  var $objectclasses = array('fdMobilePhone', 'ieee802Device');
 
   var $inheritance = array("gosaGroupOfNames" => "member");
 
-  var $preInitAttributes = array('cn', 'networkSettings');
-
   static function plInfo()
   {
     return array(
@@ -59,6 +55,7 @@ class mobilePhoneGeneric extends systemSimplePluginGlue
       'main' => array(
         'name'  => _('Properties'),
         'attrs' => array(
+          new BaseSelectorAttribute(get_ou('mobilePhoneRDN')),
           new HostNameAttribute (
             _('Name'), _('The name of the mobile phone'),
             'cn', TRUE
@@ -67,7 +64,6 @@ class mobilePhoneGeneric extends systemSimplePluginGlue
             _('Description'), _('A short description of the mobile phone'),
             'description', FALSE
           ),
-          new BaseSelectorAttribute(get_ou('mobilePhoneRDN')),
         )
       ),
       'phone' => array(
@@ -104,79 +100,31 @@ class mobilePhoneGeneric extends systemSimplePluginGlue
       ),
       'network' => array(
         'name'      => _('Network settings'),
-        'attrs'     => array(new NetworkSettingsAttribute('cn', array('ipHost', 'ieee802Device'))),
-        'template'  => get_template_path('network_section.tpl', TRUE, dirname(__FILE__)),
         'icon'      => 'geticon.php?context=categories&icon=applications-internet&size=16',
+        'attrs'     => array(
+          new IPAttribute(
+            _('IP address'), _('IP address this system uses'),
+            'ipHostNumber', FALSE
+          ),
+          new MacAddressAttribute(
+            _('Mac address'), _('Mac address of this system'),
+            'macAddress', FALSE
+          ),
+        ),
       ),
     );
   }
 
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = NULL)
-  {
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['cn']->setUnique(TRUE);
-    $this->netConfigDNS->IPisMust   = FALSE;
-    $this->netConfigDNS->MACisMust  = FALSE;
-  }
-
-  function compute_dn ()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('mobilePhoneRDN').$this->base;
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-    $this->netConfigDNS->resetCopyInfos();
-  }
-
-  function set_acl_base($base)
+  /* Used by prepare_save and template::apply */
+  public function mergeObjectClasses(array $oc)
   {
-    plugin::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    plugin::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
-  }
-
-  function remove_from_parent()
-  {
-    global $config;
-    if (!$this->initially_was_account) {
-      return;
-    }
-
-    if ($this->acl_is_removeable()) {
-      $this->netConfigDNS->remove_from_parent();
-
-      parent::remove_from_parent();
-
-      /* Delete references to object groups */
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search("(&(objectClass=gosaGroupOfNames)(member=".ldap_escape_f($this->dn)."))", array("cn"));
-      while ($ldap->fetch()) {
-        $og = new ogroup($ldap->getDN());
-        unset($og->member[$this->dn]);
-        $og->save();
-      }
+    $objectclasses = $oc;
+    if (empty($this->ipHostNumber)) {
+      $objectclasses = array_remove_entries_ics(array('ipHost'), $objectclasses);
+    } else {
+      $objectclasses[] = 'ipHost';
     }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    parent::ldap_save($cleanup);
-    $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save();
-  }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog);
+    return array_merge_unique($objectclasses, $this->objectclasses);
   }
 }
 ?>
diff --git a/systems/admin/systems/class_networkSettings.inc b/systems/admin/systems/class_networkSettings.inc
deleted file mode 100644
index b38d66143484eec76fc8d210fd5fe075948b1bce..0000000000000000000000000000000000000000
--- a/systems/admin/systems/class_networkSettings.inc
+++ /dev/null
@@ -1,493 +0,0 @@
-<?php
-
-/*
-  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2003  Cajus Pollmeier
-  Copyright (C) 2011-2015  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 networkSettings extends plugin
-{
-  /* attribute list for save action */
-  var $ignore_account = TRUE;
-
-  var $attributes     = array("ipHostNumber","macAddress");
-  var $objectclasses  = array("whatever");
-
-  var $ipHostNumber          = "";
-  var $additionalHostNumbers = array();
-  var $macAddress            = "";
-
-  var $orig_ipHostNumber   = "";
-  var $orig_macAddress     = "";
-
-  /* Initial cn */
-  var $OrigCn         = "";
-  var $IPisMust       = TRUE;
-  var $MACisMust      = TRUE;
-  var $dialog         = FALSE;
-
-  var $used_ip_mac              = array();
-
-  var $namingAttr               = "cn";
-
-  function __construct ($parent, $objectClasses, $IPisMust = FALSE, $namingAttr = "cn")
-  {
-    global $config;
-    /* We need to know which objectClasses are used, to store the ip/mac
-     * Because of different type of devices
-     */
-    $this->parent         = $parent;
-    $this->objectclasses  = $objectClasses;
-    $this->IPisMust       = $IPisMust;
-    $this->namingAttr     = $namingAttr;
-
-    parent::__construct($parent->dn, $this->parent);
-
-    $this->attrs = &$this->parent->attrs;
-
-    if (isset($this->attrs[$namingAttr][0])) {
-      $this->OrigCn = preg_replace('/\$$/', '', $this->attrs[$namingAttr][0]);
-    }
-
-    /* Create list of additional ipHostNumber. */
-    $this->additionalHostNumbers = array();
-    if (isset($this->attrs['ipHostNumber']) && $this->attrs['ipHostNumber']['count'] > 1) {
-      for ($i = 1; $i < $this->attrs['ipHostNumber']['count']; $i++) {
-        $this->additionalHostNumbers[] = $this->attrs['ipHostNumber'][$i];
-      }
-    }
-
-    /* Create a list of used mac and ip addresses.
-
-       ! We use this optically huge amount of code to fetch all
-       Mac and IP addresses, because a simple search for mac and IP
-       over the whole ldap server was 10 to 20 times slower.
-     */
-    $deps  = array();
-    $ou = preg_replace("/,.*$/", "", get_ou("systemRDN"));
-
-    $ldap = $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    $ldap->search("(&(objectClass=organizationalUnit)(".$ou."))", array("dn"));
-    while ($attrs = $ldap->fetch()) {
-        $deps[] = $attrs['dn'];
-    }
-
-    foreach ($deps as $dep) {
-      $ldap->cd($dep);
-      $ldap->search("(|(macAddress=*)(ipHostNumber=*))", array("macAddress","ipHostNumber"));
-      while ($attrs = $ldap->fetch()) {
-        if (isset($attrs['ipHostNumber'][0])) {
-          $this->used_ip_mac["ip:".$attrs['ipHostNumber'][0]] = "ip:".$attrs['ipHostNumber'][0];
-        }
-        if (isset($attrs['macAddress'][0])) {
-          $this->used_ip_mac["mac:".$attrs['macAddress'][0]] = "mac:".$attrs['macAddress'][0];
-        }
-      }
-    }
-
-    /* Save initial ip and mac values, to be able
-        check if the used values are already in use */
-    $this->orig_ipHostNumber   = $this->ipHostNumber;
-    $this->orig_macAddress     = $this->macAddress;
-  }
-
-  function resetCopyInfos()
-  {
-    $this->orig_ipHostNumber        = "";
-    $this->orig_macAddress          = "";
-    $this->OrigCn                   = "";
-    parent::resetCopyInfos();
-  }
-
-  function getCn()
-  {
-    $namingAttr = $this->namingAttr;
-    return preg_replace('/\$$/', '', $this->parent->$namingAttr);
-  }
-
-  function getVarsForSaving($attrs)
-  {
-    foreach ($this->attributes as $attr) {
-      if (!empty($this->$attr)) {
-        $attrs[$attr] = $this->$attr;
-      }
-    }
-    return $attrs;
-  }
-
-  function execute()
-  {
-    /* Call parent execute */
-    $smarty = get_smarty();
-    $smarty->assign("MACisMust", $this->MACisMust);
-
-    $tmp = $this->plInfo();
-    foreach ($tmp['plProvidedAcls'] as $name => $translation) {
-      $smarty->assign($name."ACL", $this->getacl($name));
-    }
-
-    $display = "";
-
-    /**********
-     * Additional ipHostNumber handling
-     **********/
-
-    /* Add a new one */
-    if ($this->acl_is_writeable("ipHostNumber")) {
-      foreach ($_POST as $name => $value) {
-        if (preg_match("/^additionalHostNumbers_add/", $name)) {
-          $this->additionalHostNumbers[] = "";
-          break;
-        }
-
-        /* Delete given entry */
-        if (preg_match("/^additionalHostNumbers_del_/", $name)) {
-          $id = preg_replace("/^^additionalHostNumbers_del_([0-9]*)_.*/", "\\1", $name);
-          if (isset($this->additionalHostNumbers[$id])) {
-            unset($this->additionalHostNumbers[$id]);
-            $this->additionalHostNumbers = array_values($this->additionalHostNumbers);
-          }
-          break;
-        }
-      }
-    }
-
-    $smarty->assign("additionalHostNumbers", $this->additionalHostNumbers);
-
-    if (is_object($this->dialog)) {
-      $this->dialog->save_object();
-      return $this->dialog->execute();
-    }
-
-    /* Is IP address must ? */
-    $smarty->assign("IPisMust", $this->IPisMust);
-
-    /* Assign smarty all attributes */
-    foreach ($this->attributes as $attr) {
-      $smarty->assign($attr, $this->$attr);
-    }
-
-    $display .= $smarty->fetch(get_template_path('network.tpl', TRUE));
-
-    return $display;
-  }
-
-
-  function remove_from_parent()
-  {
-  }
-
-
-  /* Save data to object */
-  function save_object()
-  {
-    if (isset($_POST['network_tpl_posted'])) {
-
-      /* Save all posted vars */
-      parent::save_object();
-
-      /******
-        Additional IP Host Numbers
-       ******/
-
-      /* Get posts for all additionally added ipHostNumbers */
-      if ($this->acl_is_writeable("ipHostNumber")) {
-        foreach ($this->additionalHostNumbers as $id => $value) {
-          if (isset($_POST['additionalHostNumbers_'.$id])) {
-            $this->additionalHostNumbers[$id] = get_post('additionalHostNumbers_'.$id);
-          }
-        }
-      }
-
-      /* Get all attributes (IP/MAC)*/
-      foreach ($this->attributes as $attr) {
-        if (isset($_POST[$attr]) && $this->acl_is_writeable($attr)) {
-          $this->$attr = $_POST[$attr];
-        }
-      }
-    }
-  }
-
-
-  /* Check supplied data */
-  function check()
-  {
-    /* Call common method to give check the hook */
-    $message = plugin::check();
-
-    /******
-      check additional IP Host Numbers
-     ******/
-
-    foreach ($this->additionalHostNumbers as $id => $value) {
-      if (!tests::is_ip($value)) {
-        $message[] = msgPool::invalid(sprintf(_("IP address %s"), ($id + 2)), "", "", "192.168.1.10");
-      }
-    }
-
-    /* Check if mac and ip are already used */
-    if (!empty($this->ipHostNumber) &&
-        $this->ipHostNumber != $this->orig_ipHostNumber &&
-        in_array("ip:".$this->ipHostNumber, $this->used_ip_mac)) {
-      $message[] = msgPool::duplicated(_("IP address"));
-    }
-
-    /* Check if ip must be given */
-    if ($this->IPisMust) {
-      if (empty($this->ipHostNumber)) {
-        $message[] = msgPool::required(_("IP address"));
-      } elseif (!tests::is_ip($this->ipHostNumber)) {
-        $message[] = msgPool::invalid(_("IP address"), "", "", "192.168.1.10");
-      }
-    }
-
-    /* Check if mac is empty */
-    if ($this->MACisMust) {
-      if ($this->macAddress == "" ) {
-        $message[] = msgPool::required(_("MAC address"));
-      } elseif (!tests::is_mac($this->macAddress)) {
-        $message[] = msgPool::invalid(_("MAC address"), "", "", "00:0C:7F:31:33:F1");
-      }
-    }
-
-    return $message;
-  }
-
-
-  /* Save to LDAP */
-  function save()
-  {
-    global $config;
-    $ldap = $config->get_ldap_link();
-
-    $dn = $this->parent->dn;
-    $cn = $this->getCn();
-
-    /* IP-MAC HANDLING */
-
-    /* $dn was posted as parameter */
-    $this->dn = $dn;
-
-    /* Save ip/Mac*/
-    parent::save();
-
-    /* Add all additional ipHostNumbers now */
-    if (!empty($this->ipHostNumber)) {
-      $this->attrs['ipHostNumber'] = array($this->ipHostNumber);
-    }
-    foreach ($this->additionalHostNumbers as $value) {
-      $this->attrs['ipHostNumber'][] = $value;
-    }
-
-    /* Do not add the objectClass ipHost if no ip address is given */
-    if (!isset($this->attrs['ipHostNumber']) || empty($this->attrs['ipHostNumber'])) {
-      $this->attrs['objectClass'] = array_remove_entries(array('ipHost'), $this->attrs['objectClass']);
-    }
-
-    /* Write back to ldap */
-    $ldap->cd($this->dn);
-    $this->cleanup();
-    $ldap->modify ($this->attrs);
-
-    /* Display errors */
-    if (!$ldap->success()) {
-      msg_dialog::display(_('LDAP error'), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()), LDAP_ERROR);
-    }
-
-    $this->dialog = FALSE;
-  }
-
-  static function plInfo()
-  {
-    return array(
-      'plShortName'   => _('Network'),
-      'plDescription' => _('Network settings'),
-      'plSelfModify'  => FALSE,
-      'plPriority'    => 5,
-      'plCategory'    => array('workstation', 'terminal', 'phone', 'server', 'component', 'printer', 'winstation'),
-
-      'plProvidedAcls' => array(
-        'ipHostNumber'  => _('IP address'),
-        'macAddress'    => _('MAC address')
-      )
-    );
-  }
-
-  function generateRandomIP($net = "")
-  {
-    global $config;
-    /* first gather all IPs */
-    $ldap = $config->get_ldap_link();
-    $ocs =
-      '(objectClass=fdPhone)'.
-      '(objectClass=fdMobilePhone)'.
-      '(objectClass=goServer)'.
-      '(objectClass=GOhard)'.
-      '(objectClass=gotoTerminal)'.
-      '(objectClass=gotoWorkstation)'.
-      '(objectClass=gotoPrinter)'.
-      '(objectClass=ipHost)';
-    $list = array();
-    $ldap->search("(&(|{$ocs})(ipHostNumber=*))", array("ipHostNumber"));
-    while ($attrs = $ldap->fetch()) {
-      if (preg_match("/^$net\./", $attrs['ipHostNumber'][0])) {
-        $list[] = $attrs['ipHostNumber'][0];
-      }
-    }
-
-    /* Set starting ip. */
-    $ip_data = preg_split('/\./', $net);
-    for ($i = 0;$i < 4;$i++) {
-      if (!isset($ip_data[$i])) {
-        $ip_data[$i] = 0;
-      }
-    }
-
-    /* Search the next free and valid ip. */
-    while (in_array(implode('.', $ip_data), $list) || $ip_data[3] <= 1) {
-      $ip_data[3]++;
-      if ($ip_data[3] >= 255) {
-        $ip_data[3] = 1;
-        $ip_data[2]++;
-      }
-      if ($ip_data[2] >= 255) {
-        $ip_data[2] = 1;
-        $ip_data[1]++;
-      }
-      if ($ip_data[1] >= 255) {
-        $ip_data[1] = 1;
-        $ip_data[0]++;
-      }
-      if ($ip_data[0] >= 255) {
-        break;
-      }
-    }
-
-    return implode('.', $ip_data);
-  }
-
-
-  function create_tree($arr, $base, $current = '')
-  {
-    $ret = array();
-    foreach ($arr as $r => $name) {
-      $base_part = str_replace($base, '', $r);
-      if (preg_match('/^[a-z]*='.preg_quote($name, '/').'(|,)$/i', $base_part)) {
-        $ret[$r] = $current.$name;
-        $tmp = $this->create_tree($arr, $r, $current.'.&nbsp;');
-        foreach ($tmp as $sub_key => $sub_name) {
-          $ret[$sub_key] = $sub_name;
-        }
-      }
-    }
-    return $ret;
-  }
-}
-
-class NetworkSettingsDialog
-{
-  private $attribute;
-  private $display;
-
-  function __construct (&$attribute, &$display)
-  {
-    $this->attribute  = &$attribute;
-    $this->display    = &$display;
-  }
-
-  function execute ()
-  {
-    $this->display = $this->attribute->netConfigDNS->execute();
-    if (is_object($this->attribute->netConfigDNS->dialog)) {
-      return $this->display;
-    }
-    return FALSE;
-  }
-}
-
-class NetworkSettingsAttribute extends Attribute
-{
-  public $netConfigDNS;
-  protected $display = NULL;
-  protected $namingAttr;
-  protected $ocs;
-
-  function __construct ($namingAttr = 'cn', $ocs = array())
-  {
-    parent::__construct('Network Settings', '', 'networkSettings', FALSE, '');
-    $this->setInLdap(FALSE);
-    $this->namingAttr = $namingAttr;
-    $this->ocs        = $ocs;
-  }
-
-  function setManagedAttributes ($dontcare)
-  {
-    trigger_error('method setManagedAttributes is not supported for NetworkSettingsAttribute');
-  }
-
-  function setParent (&$plugin)
-  {
-    parent::setParent($plugin);
-    if (is_object($this->plugin)) {
-      $this->netConfigDNS = new networkSettings($this->plugin,
-        array_merge($this->plugin->objectclasses, $this->ocs),
-        TRUE, $this->namingAttr
-      );
-      $this->plugin->netConfigDNS = $this->netConfigDNS;
-    }
-  }
-
-  function renderAttribute(&$attributes, $readOnly)
-  {
-    if ($this->display === NULL) {
-      $this->display = $this->netConfigDNS->execute();
-    }
-    $attributes[$this->getLdapName()] = array(
-      'display'     => $this->display
-    );
-  }
-
-  function loadPostValue ()
-  {
-  }
-
-  function applyPostValue ()
-  {
-    if (!$this->disabled) {
-      /* Refresh base */
-      $this->netConfigDNS->save_object();
-      $this->display = $this->netConfigDNS->execute();
-      if (is_object($this->netConfigDNS->dialog)) {
-        $this->plugin->openDialog(new NetworkSettingsDialog($this, $this->display));
-      }
-    }
-  }
-
-  function check ()
-  {
-    $error = parent::check();
-    if (!empty($error)) {
-      return $error;
-    } else {
-      return $this->netConfigDNS->check();
-    }
-  }
-}
-
-?>
diff --git a/systems/admin/systems/class_phoneGeneric.inc b/systems/admin/systems/class_phoneGeneric.inc
index b074f9d20ff8df8b2bfeab86339e86cbcd68c779..61854942bc4884be4b82ed34f280aeac0cda7efd 100644
--- a/systems/admin/systems/class_phoneGeneric.inc
+++ b/systems/admin/systems/class_phoneGeneric.inc
@@ -18,18 +18,14 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class phoneGeneric extends systemSimplePluginGlue
+class phoneGeneric extends simplePlugin
 {
   var $mainTab = TRUE;
 
-  var $netConfigDNS;
-
-  var $objectclasses = array('fdPhone', 'device');
+  var $objectclasses = array('fdPhone', 'ieee802Device');
 
   var $inheritance = array('gosaGroupOfNames' => 'member');
 
-  var $preInitAttributes = array('cn', 'networkSettings');
-
   static function plInfo()
   {
     return array(
@@ -81,68 +77,33 @@ class phoneGeneric extends systemSimplePluginGlue
       ),
       'network' => array(
         'name'      => _('Network settings'),
-        'attrs'     => array(new NetworkSettingsAttribute('cn', array('ipHost', 'ieee802Device'))),
-        'template'  => get_template_path('network_section.tpl', TRUE, dirname(__FILE__)),
         'icon'      => 'geticon.php?context=categories&icon=applications-internet&size=16',
+        'attrs'     => array(
+          new SetAttribute(
+            new IPAttribute(
+              _('IP address'), _('IP addresses this system uses (v4 or v6)'),
+              'ipHostNumber', FALSE
+            )
+          ),
+          new MacAddressAttribute(
+            _('Mac address'), _('Mac address of this system'),
+            'macAddress', FALSE
+          ),
+        ),
       ),
     );
   }
 
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = NULL)
-  {
-    parent::__construct($dn, $object, $parent, $mainTab);
-
-    $this->attributesAccess['cn']->setUnique(TRUE);
-    $this->netConfigDNS->IPisMust   = FALSE;
-    $this->netConfigDNS->MACisMust  = FALSE;
-  }
-
-  function compute_dn ()
+  /* Used by prepare_save and template::apply */
+  public function mergeObjectClasses(array $oc)
   {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('phoneRDN').$this->base;
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-    $this->netConfigDNS->resetCopyInfos();
-  }
-
-  function set_acl_base($base)
-  {
-    plugin::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    plugin::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
-  }
-
-  function remove_from_parent()
-  {
-    if (!$this->initially_was_account) {
-      return;
-    }
-
-    if ($this->acl_is_removeable()) {
-      $this->netConfigDNS->remove_from_parent();
-
-      parent::remove_from_parent();
+    $objectclasses = $oc;
+    if (empty($this->ipHostNumber)) {
+      $objectclasses = array_remove_entries_ics(array('ipHost'), $objectclasses);
+    } else {
+      $objectclasses[] = 'ipHost';
     }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    parent::ldap_save($cleanup);
-    $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save();
-  }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog);
+    return array_merge_unique($objectclasses, $this->objectclasses);
   }
 }
 ?>
diff --git a/systems/admin/systems/class_printGeneric.inc b/systems/admin/systems/class_printGeneric.inc
index 11c0ef38f7fdec4b737440ade0eb67d68cb550b2..83e5b05cf577e1316922f012cb01af4384074657 100644
--- a/systems/admin/systems/class_printGeneric.inc
+++ b/systems/admin/systems/class_printGeneric.inc
@@ -135,11 +135,5 @@ class printGeneric extends simplePlugin
       ),
     );
   }
-
-  /* Returns the dn of the entry */
-  function compute_dn()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('printerRDN').$this->base;
-  }
 }
 ?>
diff --git a/systems/admin/systems/class_serverGeneric.inc b/systems/admin/systems/class_serverGeneric.inc
index 2efb6389256f21251dcbf81342b6a6df856ea665..cac3eedddc3f5be92aa0077de56e9fa69881bba4 100644
--- a/systems/admin/systems/class_serverGeneric.inc
+++ b/systems/admin/systems/class_serverGeneric.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2012-2016  FusionDirectory
@@ -21,11 +20,19 @@
 
 class serverGeneric extends workstationGeneric
 {
-  var $objectclasses = array('top', 'goServer', 'GOhard');
+  var $objectclasses = array('fdServer', 'ipHost', 'ieee802Device');
 
-  var $inheritance = FALSE;
+  static function getAttributesInfo ($word = NULL, $rdn = NULL)
+  {
+    if ($word === NULL) {
+      $word = _('server');
+    }
+    if ($rdn === NULL) {
+      $rdn = get_ou('serverRDN');
+    }
+    return parent::getAttributesInfo($word, $rdn);
+  }
 
-  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -36,7 +43,7 @@ class serverGeneric extends workstationGeneric
         'server' => array(
           'name'        => _('Server'),
           'description' => _('Server'),
-          'filter'      => 'objectClass=goServer',
+          'filter'      => 'objectClass=fdServer',
           'icon'        => 'geticon.php?context=devices&icon=server&size=16',
           'ou'          => get_ou('serverRDN'),
           'tabClass'    => 'servtabs',
@@ -45,26 +52,5 @@ class serverGeneric extends workstationGeneric
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
-
-  /*!
-   *  \brief The main function : information about attributes
-   */
-  static function getAttributesInfo ($word = NULL, $rdn = NULL)
-  {
-    if ($word === NULL) {
-      $word = _('server');
-    }
-    if ($rdn === NULL) {
-      $rdn = get_ou('serverRDN');
-    }
-    return parent::getAttributesInfo($word, $rdn);
-  }
-
-  /* Returns the dn of the entry */
-  function compute_dn()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('serverRDN').$this->base;
-  }
 }
-
 ?>
diff --git a/systems/admin/systems/class_serverService.inc b/systems/admin/systems/class_serverService.inc
index c1454adb500b97e8a4f7cab0adfeb82f9221a593..b3200217273e75f7ca8155b0332818916e71fba6 100644
--- a/systems/admin/systems/class_serverService.inc
+++ b/systems/admin/systems/class_serverService.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
@@ -20,23 +19,28 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class ServerService extends management
+class ServerService extends simpleManagement
 {
   static public $actionStatus = array(
-    "start"   => "running",
-    "stop"    => "stopped",
-    "restart" => "running",
-    "status"  => "",
+    'start'   => 'running',
+    'stop'    => 'stopped',
+    'restart' => 'running',
+    'status'  => '',
   );
 
-  /* attribute list for save action */
+  protected $departmentBrowser      = FALSE;
+  protected $departmentRootVisible  = FALSE;
+  protected $baseMode               = FALSE;
+
+  protected $autoFilter   = FALSE;
+  protected $autoActions  = FALSE;
+
   var $ignore_account   = TRUE;
   var $skipFooter       = TRUE;
   var $skipHeader       = TRUE;
   var $skipCpHandler    = TRUE;
   var $skipSnapHandler  = TRUE;
   var $plugins          = array();
-  var $pluign_names     = array();
   var $current          = "";
   var $dialog           = FALSE;
   var $read_only        = FALSE;
@@ -44,7 +48,6 @@ class ServerService extends management
   var $acl;
   var $cn;
   var $parent;
-  var $pl_notify        = FALSE;
   var $acl_category     = "";
   var $acl_base         = "";
 
@@ -77,29 +80,14 @@ class ServerService extends management
     /* Initialize acl base */
     $this->set_acl_base($this->dn);
 
-    // Set storage points - We do not have any - We just create a fake list which lists all services
-    $this->storagePoints = array("");
-
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")) {
-      $filter = session::global_get(get_class($this)."_filter");
-    } else {
-      $filter = new filter(get_template_path("serverService-filter.xml", TRUE, dirname(__FILE__)));
-      $filter->setObjectStorage($this->storagePoints);
-    }
-    $this->setFilter($filter);
-
-    // Build headpage
-    $headpage = new listing(get_template_path("serverService-list.xml", TRUE, dirname(__FILE__)));
-    $headpage->registerElementFilter("filterServiceStatus", "ServerService::filterServiceStatus");
-    $headpage->setFilter($filter);
+    $this->filterXMLPath  = get_template_path('serverService-filter.xml', TRUE, dirname(__FILE__));
+    $this->listXMLPath    = get_template_path('serverService-list.xml',   TRUE, dirname(__FILE__));
 
     // Initialize list of used and useable services.
     foreach ($config->data['TABS']['SERVERSERVICE'] as $plug) {
       if (class_available($plug['CLASS'])) {
         $name = $plug['CLASS'];
 
-        $this->plugin_names[] = $name;
         $this->plugins[$name] = new $name($dn, $this);
 
         /* Capture all service objectClases, necessary for acl handling */
@@ -111,20 +99,25 @@ class ServerService extends management
       }
     }
 
-    parent::__construct("services", $headpage);
-    $this->registerAction("new",                "newService");
+    parent::__construct();
+  }
+
+  function configureHeadpage ()
+  {
+    parent::configureHeadpage();
+    $this->headpage->registerElementFilter('filterServiceStatus', 'ServerService::filterServiceStatus');
+
+    $this->registerAction('new',                'newService');
     foreach ($this->plugins as $name => $obj) {
-      $this->registerAction("new_$name",        "newService");
-    }
-    $this->registerAction("remove",             "removeService");
-    $this->registerAction("newServiceSelected", "newServiceSelected");
-    $this->registerAction("saveService",        "saveService");
-    $this->registerAction("cancelService",      "cancelEdit");
-    $this->registerAction("newServiceCancel",   "closeDialogs");
-    $this->registerAction("status",             "updateServiceStatus");
-    $this->registerAction("restart",            "updateServiceStatus");
-    $this->registerAction("stop",               "updateServiceStatus");
-    $this->registerAction("start",              "updateServiceStatus");
+      $this->registerAction('new_'.$name,       'newService');
+    }
+    $this->registerAction('remove',             'removeService');
+    $this->registerAction('saveService',        'saveService');
+    $this->registerAction('cancelService',      'cancelEdit');
+    $this->registerAction('status',             'updateServiceStatus');
+    $this->registerAction('restart',            'updateServiceStatus');
+    $this->registerAction('stop',               'updateServiceStatus');
+    $this->registerAction('start',              'updateServiceStatus');
     $this->updateActionMenu();
   }
 
@@ -147,64 +140,55 @@ class ServerService extends management
     }
   }
 
-
   /*! \brief    Filter extra POST and GET variables for this plugin.
    */
   function detectPostActions()
   {
-    $action = management::detectPostActions();
-    if (isset($_POST['SaveServiceAdd'])) {
-      $action['action'] = "newServiceSelected";
-    } elseif (isset($_POST['CancelServiceAdd'])) {
-      $action['action'] = "newServiceCancel";
-    } elseif (isset($_POST['SaveService'])) {
-      $action['action'] = "saveService";
+    $action = parent::detectPostActions();
+    if (isset($_POST['SaveService'])) {
+      $action['action'] = 'saveService';
     } elseif (isset($_POST['CancelService'])) {
-      $action['action'] = "cancelService";
+      $action['action'] = 'cancelService';
     }
     return $action;
   }
 
-
   /*! \brief  Edit an existing service here.
    *          Somebody clicked on the paper and pencil icon.
    */
-  function editEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
+  function editEntry($action, array $target, array $all)
   {
-    $this->dialog = TRUE;
     $s_entry = array_pop($target);
     if ($this->plugins[$s_entry]->acl_is_readable("")) {
       $this->backup       = get_object_vars($this->plugins[$s_entry]);
       $this->dialogObject = $this->plugins[$s_entry];
+      $this->dialog       = TRUE;
       $this->current      = $s_entry;
     }
   }
 
-
   /*! \brief  Editing an object was caneled.
    *          Close dialogs/tabs and remove locks.
    */
   protected function cancelEdit()
   {
-    if ($this->backup == NULL && $this->current) {
+    if (($this->backup == NULL) && $this->current) {
       $this->plugins[$this->current] = new $this->current($this->dn, $this);
       $this->plugins[$this->current]->set_acl_base($this->acl_base);
-      $this->plugins[$this->current]->set_acl_category(preg_replace("/\/$/", "", $this->acl_category));
-
+      $this->plugins[$this->current]->set_acl_category(preg_replace('/\/$/', '', $this->acl_category));
     } elseif (is_array($this->backup)) {
       foreach ($this->backup as $name => $value) {
         $this->plugins[$this->current]->$name = $value;
       }
     }
     $this->backup   = NULL;
-    $this->current  = "";
+    $this->current  = '';
     $this->closeDialogs();
   }
 
-
-  /*! \brief  Let the user choose the new service to create.
+  /*! \brief  Let the user create a new service
    */
-  function newService($action = "")
+  function newService($action = '')
   {
     $this->closeDialogs();
     $serv = preg_replace('/^new_/', '', $action);
@@ -222,37 +206,31 @@ class ServerService extends management
     $msgs = $this->dialogObject->check();
     if (count($msgs)) {
       foreach ($msgs as $msg) {
-        msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
+        msg_dialog::display(_('Error'), $msg, ERROR_DIALOG);
       }
     } else {
       $this->plugins[$this->current] = $this->dialogObject;
-      $tmp  = get_object_vars($this->dialogObject);
-      foreach ($tmp as $name => $value) {
-        $this->plugins[$this->current]->$name = $value;
-      }
       $this->closeDialogs();
       $this->backup = NULL;
       $this->updateActionMenu();
     }
   }
 
-
   /*!\brief   Close all opened dialogs
    *          And reset "dialog open" flags to display bottom buttons again.
    */
   function closeDialogs()
   {
-    management::closeDialogs();
+    parent::closeDialogs();
     $this->dialog = FALSE;
     /* Get our dn back */
     $this->dn     = $this->last_dn;
     set_object_info($this->dn);
   }
 
-
   /*! \brief    Remove the selected service(s)
    */
-  protected function removeService($action = "", $target = array(), $all = array())
+  protected function removeService($action, array $target)
   {
     foreach ($target as $s_entry) {
       $new_obj = new $s_entry($this->dn, $this);
@@ -260,138 +238,43 @@ class ServerService extends management
       $new_obj->set_acl_category(preg_replace("/\/$/", "", $this->acl_category));
       $tmp = $new_obj->getListEntry();
 
-      /* Check if we are allowed to remove this service
-       */
+      /* Check if we are allowed to remove this service */
       if ($tmp['AllowRemove']) {
-        $str = $this->plugins[$s_entry]->allow_remove();
-        if (empty($str)) {
-          $this->plugins[$s_entry]              = $new_obj;
-          $this->plugins[$s_entry]->is_account  = FALSE;
-        } else {
-          msg_dialog::display(_("Error"), $str, ERROR_DIALOG);
-        }
+        $this->plugins[$s_entry]              = $new_obj;
+        $this->plugins[$s_entry]->is_account  = FALSE;
       }
     }
   }
 
-
-  /*! \brief    Returns the list of of services, active services.
-   *            Used in the filter class for services.
-   *             class_filterServerService.inc
-   */
-  static function getServiceList()
+  function renderList()
   {
-    return session::get('ServerService');
-  }
-
-
-  /*! \brief    Returns an image for the service status.
-   *            Used in the service list class.
-   */
-  static function filterServiceStatus($a, $b, $c, $d)
-  {
-    $img = "";
-    if (isset($d['0'])) {
-      switch ($d[0]) {
-        case 'stopped':
-          $img = 'geticon.php?context=status&icon=task-stopped&size=16';
-          break;
-        case 'running':
-          $img = 'geticon.php?context=status&icon=task-running&size=16';
-          break;
-      }
-    }
-    if (!empty($img)) {
-      return '<img src=\''.$img.'\'>';
-    }
-    return "&nbsp;";
-  }
-
-
-  /*! \brief  Execute this plugin
-   *          Handle actions/events, locking, snapshots, dialogs, tabs,...
-   */
-  function execute()
-  {
-    // Ensure that html posts and gets are kept even if we see a 'Entry islocked' dialog.
-    $vars = array('/^act$/','/^listing/','/^PID$/','/^FILTER_PID$/');
-    session::set('LOCK_VARS_TO_USE', $vars);
-
-    /* Display the copy & paste dialog, if it is currently open */
-    $ret = $this->copyPasteHandler("", array());
-    if ($ret) {
-      return $this->getHeader().$ret;
-    }
-
-    // Update filter
-    $filter = $this->getFilter();
-    if ($filter) {
-      $filter->update();
-      session::global_set(get_class($this)."_filter", $filter);
-      session::set('autocomplete', $filter);
-      if (!$filter->isValid()) {
-        msg_dialog::display(_("Filter error"), _("The filter is incomplete!"), ERROR_DIALOG);
-      }
-    }
-
-    // Handle actions (POSTs and GETs)
-    $str = $this->handleActions($this->detectPostActions());
-    if ($str) {
-      return $this->getHeader().$str;
-    }
-
-    // Open single dialog objects
-    if (is_object($this->dialogObject)) {
-      if (method_exists($this->dialogObject, 'execute')) {
-
-        /* There is currently a subdialog open, display this dialog */
-        $add = "";
-        if (isset($this->dialogObject->krb_host_key) && $this->dialogObject->krb_host_key instanceof krbHostKeys) {
-          $add = $this->dialogObject->krb_host_key->save_object_by_prefix($this->dialogObject->krb_service_prefix);
-          $add = $this->dialogObject->krb_host_key->execute_by_prefix($this->dialogObject->krb_service_prefix, TRUE);
-        }
-
-        $display = $add.$this->dialogObject->execute();
-        $display .= $this->_getTabFooter();
-        return $this->getHeader().$display;
-      }
-    }
-
-    // Display tab object.
-    if ($this->tabObject instanceOf simpleTabs) {
-      $display = $this->tabObject->execute();
-      $display .= $this->_getTabFooter();
-      return $this->getHeader().$display;
-    }
-
-    // Display list
+    /* Save services in session, will be used by filterServerService when updating list */
     session::set('ServerService', $this->plugins);
-    return $this->renderList();
+    return parent::renderList();
   }
 
   function updateServicesVars ($service)
   {
-    foreach (array("cn","dn") as $var) {
+    foreach (array('cn','dn') as $var) {
       if (isset($this->$var)) {
         $this->plugins[$service]->$var = $this->$var;
       }
     }
   }
 
-
   /*! \brief    Updates the status for a list of services.
    */
-  function updateServiceStatus($action, $target, $all)
+  function updateServiceStatus($action, array $target)
   {
     /* Skip if this is a new server */
-    if ($this->dn == "new") {
-      msg_dialog::display(_("Information"), _("Cannot update service status until it has been saved!"), INFO_DIALOG);
+    if ($this->dn == 'new') {
+      msg_dialog::display(_('Information'), _('Cannot update service status until it has been saved!'), INFO_DIALOG);
       return;
     }
 
     /* Is this an existing action */
     if (!isset(static::$actionStatus[$action])) {
-      msg_dialog::display(_("Error"), _("Unknown action $action"), ERROR_DIALOG);
+      msg_dialog::display(_('Error'), sprintf(_('Unknown action "%s"'), $action), ERROR_DIALOG);
       return;
     }
 
@@ -401,7 +284,6 @@ class ServerService extends management
     }
   }
 
-
   /*! \brief    Updates the status of a service and
    *             calls an external hook if specified in fusiondirectory.conf
    */
@@ -413,38 +295,39 @@ class ServerService extends management
       $s_daemon = new supportDaemon();
       if ($s_daemon->is_error()) {
         msg_dialog::display(
-          sprintf(_("Could not get execute action %s on service %s."), $action, $service),
+          sprintf(_('Could not get execute action %s on service %s.'), $action, $service),
           msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
         );
       } else {
-        $target = array($this->parent->getBaseObject()->netConfigDNS->macAddress);
+        $target = array($this->parent->getBaseObject()->macAddress);
         if ($action == 'status') {
-          $res = $s_daemon->append_call("Service.is_running", $target, array("args" => array($service)));
+          $res = $s_daemon->append_call('Service.is_running', $target, array('args' => array($service)));
+
           if ($s_daemon->is_error()) {
             msg_dialog::display(
-              sprintf(_("Could not get execute action %s on service %s."), $action, $service),
+              sprintf(_('Could not get execute action %s on service %s.'), $action, $service),
               msgPool::siError($s_daemon->get_error()), ERROR_DIALOG
             );
           } else {
-            $this->plugins[$service]->setStatus($res == "yes"?"running":"stopped");
+            $this->plugins[$service]->setStatus($res == 'yes' ? 'running' : 'stopped');
           }
         } else {
-          $res = $s_daemon->append_call("Service.manage", $target, array("args" => array($service, $action)));
+          $res = $s_daemon->append_call('Service.manage', $target, array('args' => array($service, $action)));
 
           if ($s_daemon->is_error()) {
             msg_dialog::display(
-              sprintf(_("Could not get execute action %s on service %s."), $action, $service),
+              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(static::$actionStatus[$action]);
           }
         }
+        return $res;
       }
     }
   }
 
-
   /*! \brief   Returns a list of all used services
    *            CLASSNAME => _($this->plugins[*]->DisplayName);
    */
@@ -463,7 +346,6 @@ class ServerService extends management
     return $ret;
   }
 
-
   /*! \brief    Returns a list of all unused services.
    */
   function getAllUnusedServices()
@@ -502,7 +384,6 @@ class ServerService extends management
     return $ret;
   }
 
-
   /*! \brief    No checks here.
    */
   function check()
@@ -510,48 +391,53 @@ class ServerService extends management
     return array();
   }
 
-
   /*! \brief    Keep posted form values in opened dialogs
    */
   function save_object()
   {
-    if ($this->dialog && is_object($this->dialogObject)) {
-      if (method_exists($this->dialogObject, 'save_object')) {
-        $this->dialogObject->save_object();
-      }
-    }
+    // save_object of the dialog is called in management::execute
+    //~ if ($this->dialog && is_object($this->dialogObject)) {
+      //~ if (method_exists($this->dialogObject, 'save_object')) {
+        //~ $this->dialogObject->save_object();
+      //~ }
+    //~ }
   }
 
-
   /*! \brief    Remove all active services
    */
   function remove_from_parent()
   {
+    $errors = array();
     foreach ($this->plugins as $name => $obj) {
       $this->updateServicesVars($name);
       if ($this->plugins[$name]->initially_was_account) {
-        if (isset($this->plugins[$name]->krb_host_key) && $this->plugins[$name]->krb_host_key instanceof krbHostKeys) {
-          $this->plugins[$name]->krb_host_key->remove_from_parent_by_prefix($this->plugins[$name]->krb_service_prefix);
+        $result = $this->plugins[$name]->remove_from_parent();
+        if (!empty($result)) {
+          $errors = array_merge($errors, $result);
         }
-        $this->plugins[$name]->remove_from_parent();
       }
     }
+    return $errors;
   }
 
-
   /*! \brief    Save all active services
    */
   function save()
   {
+    $errors = array();
     foreach ($this->plugins as $name => $obj) {
       $this->updateServicesVars($name);
 
       if ($this->plugins[$name]->is_account) {
-        $this->plugins[$name]->save();
+        $result = $this->plugins[$name]->save();
       } elseif ($this->plugins[$name]->initially_was_account) {
-        $this->plugins[$name]->remove_from_parent();
+        $result = $this->plugins[$name]->remove_from_parent();
+      }
+      if (!empty($result)) {
+        $errors = array_merge($errors, $result);
       }
     }
+    return $errors;
   }
 
   /*! \brief    Prepare active services to be copied.
@@ -565,51 +451,76 @@ class ServerService extends management
     unset($plugin);
   }
 
+  /*! \brief    Forward plugin acls
+   */
+  function set_acl_base($base)
+  {
+    $this->acl_base = $base;
+    foreach ($this->plugins as $name => $obj) {
+      $this->plugins[$name]->set_acl_base($base);
+    }
+  }
 
-  /*! \brief    Prepare active services to be copied.
+  /*! \brief    Forward plugin acls
    */
-  function postCopyHook()
+  function set_acl_category($category)
+  {
+    $this->acl_category = $category;
+    foreach ($this->plugins as $name => $obj) {
+      $this->plugins[$name]->set_acl_category($category);
+    }
+  }
+
+  function setTemplate ($bool)
   {
     foreach ($this->plugins as &$plugin) {
-      $plugin->postCopyHook();
+      $plugin->setTemplate($bool);
     }
     unset($plugin);
   }
 
+  function getRequiredAttributes()
+  {
+    return array();
+  }
 
-  /*! \brief    Check if there is an active service which prevents
-   *             complete service removal.
-   */
-  function allow_remove()
+  function adapt_from_template($attrs, $skip = array())
   {
-    foreach ($this->plugins as $obj) {
-      $str = $obj->allow_remove();
-      if (!empty($str)) {
-        return $str;
-      }
+    foreach ($this->plugins as &$plugin) {
+      $plugin->adapt_from_template($attrs, $skip);
     }
+    unset($plugin);
   }
 
-
-  /*! \brief    Forward plugin acls
+  /*! \brief    Returns the services list.
+   *            Used in the filter class for services.
+   *             class_filterServerService.inc
    */
-  function set_acl_base($base)
+  static function getServiceList()
   {
-    $this->acl_base = $base;
-    foreach ($this->plugins as $name => $obj) {
-      $this->plugins[$name]->set_acl_base($base);
-    }
+    return session::get('ServerService');
   }
 
-
-  /*! \brief    Forward plugin acls
+  /*! \brief    Returns an image for the service status.
+   *            Used in the service list class.
    */
-  function set_acl_category($category)
+  static function filterServiceStatus($a, $b, $c, $d)
   {
-    $this->acl_category = $category;
-    foreach ($this->plugins as $name => $obj) {
-      $this->plugins[$name]->set_acl_category($category);
+    $img = '';
+    if (isset($d['0'])) {
+      switch ($d[0]) {
+        case 'stopped':
+          $img = 'geticon.php?context=status&icon=task-stopped&size=16';
+          break;
+        case 'running':
+          $img = 'geticon.php?context=status&icon=task-running&size=16';
+          break;
+      }
+    }
+    if (!empty($img)) {
+      return '<img src="'.$img.'"/>';
     }
+    return '&nbsp;';
   }
 }
 ?>
diff --git a/systems/admin/systems/class_systemImport.inc b/systems/admin/systems/class_systemImport.inc
index 8b84017da78da591a73ff2ba0247d2abfcafa044..8b5db87cc40d5388ff51bef80800cd1fb3d049fc 100644
--- a/systems/admin/systems/class_systemImport.inc
+++ b/systems/admin/systems/class_systemImport.inc
@@ -72,7 +72,7 @@ class systemImport extends simplePlugin
         $messages[$host['id']] = array(sprintf(_('Could not parse %s'), $host['id']));
         continue;
       }
-      $cn   = $m[1].'$';
+      $cn   = $m[1];
       $zone = $m[2];
 
       $objectType = $defaultObjectType;
@@ -83,46 +83,53 @@ class systemImport extends simplePlugin
       $tabObject->set_acl_base($base);
       $baseObject = $tabObject->getBaseObject();
       $baseObject->cn   = $cn;
-      $baseObject->uid  = $baseObject->cn;
-      $baseObject->description                = $host['description'];
-      $baseObject->netConfigDNS->ipHostNumber = $host['ipAddress'];
-      $baseObject->netConfigDNS->macAddress   = $host['hardwareAddress'];
+      $baseObject->description  = $host['description'];
+      if (!is_array($host['ipAddress'])) {
+        $host['ipAddress'] = array($host['ipAddress']);
+      }
+      $baseObject->ipHostNumber = $host['ipAddress'];
+      $baseObject->macAddress   = $host['hardwareAddress'];
 
       /* Get existing DHCP servers */
       if (empty($dhcps)) {
-        $dhcpParentNodes = $baseObject->netConfigDNS->dhcpParentNodes;
+        $dhcpParentNodes = dhcpSystem::getDhcpParentNodes();
         $ldap = $config->get_ldap_link();
         foreach ($dhcpParentNodes as $dn => $value) {
           $ldap->cat($dn);
           if ($attrs = $ldap->fetch()) {
             if (isset($attrs['dhcpNetMask'])) {
-              $dhcps[$dn] = array($attrs['cn'][0],normalize_netmask($attrs['dhcpNetMask'][0]));
+              $dhcps[$dn] = array($attrs['cn'][0], normalize_netmask($attrs['dhcpNetMask'][0]));
             }
           }
         }
       }
       /* Activate DHCP if we find a matching server */
-      if (!empty($baseObject->netConfigDNS->ipHostNumber)) {
-        $baseObject->netConfigDNS->dhcp_is_Account = FALSE;
+      if (!empty($baseObject->ipHostNumber)) {
         foreach ($dhcps as $dn => $infos) {
           list($ip, $mask) = $infos;
-          if (tests::is_in_network($ip, $mask, $baseObject->netConfigDNS->ipHostNumber)) {
-            $baseObject->netConfigDNS->dhcp_is_Account  = TRUE;
-            $baseObject->netConfigDNS->dhcpParentNode   = $dn;
-            break;
+          foreach ($baseObject->ipHostNumber as $ipHostNumber) {
+            if (tests::is_in_network($ip, $mask, $ipHostNumber)) {
+              $tabObject->by_object['dhcpSystem']->attributesAccess['dhcpHosts']->addPostValue(
+                array($dn, $baseObject->macAddress, $ipHostNumber, '')
+              );
+              $tabObject->by_object['dhcpSystem']->attributesAccess['dhcpHosts']->applyPostValue();
+            }
           }
         }
-        if ($baseObject->netConfigDNS->dhcp_is_Account == FALSE) {
-          $messages[$host['id']] = array(sprintf(_('No DHCP server found for ip %s'), $baseObject->netConfigDNS->ipHostNumber));
+        if (empty($tabObject->by_object['dhcpSystem']->dhcpHosts)) {
+          $messages[$host['id']] = array(sprintf(_('No DHCP server found for IPs %s'), implode(',', $baseObject->ipHostNumber)));
           continue;
         }
       }
       /* Activate DNS if we find a matching server */
       $tabObject->by_object['dnsHost']->is_account = FALSE;
       foreach ($dns as $dn => $value) {
-        if (preg_match('/'.$zone.'\.?$/', $value)) {
+        if (preg_match('/^'.$zone.'\.?$/', $value)) {
           $tabObject->by_object['dnsHost']->is_account  = TRUE;
           $tabObject->by_object['dnsHost']->fdDNSZoneDn = array($dn);
+          foreach ($baseObject->ipHostNumber as $ipHostNumber) {
+            $tabObject->by_object['dnsHost']->addRecord($dn, array($cn, 'aRecord', $ipHostNumber, ''));
+          }
           break;
         }
       }
@@ -143,12 +150,11 @@ class systemImport extends simplePlugin
       }
 
       /* Perform checks */
-      $message = $tabObject->check();
+      $message = $tabObject->save();
 
       if (count($message) == 0) {
         /* No errors, save object */
         $messages[$host['id']] = TRUE;
-        $tabObject->save();
       } else {
         /* Errors found */
         $messages[$host['id']] = $message;
@@ -164,7 +170,7 @@ class systemImport extends simplePlugin
         'template'  => get_template_path('server_import.tpl', TRUE, dirname(__FILE__)),
         'name'      => _('Import'),
         'attrs'     => array(
-          new BaseSelectorAttribute(get_ou('sambaMachineAccountRDN')),
+          new BaseSelectorAttribute(get_ou('workstationRDN')),
           new ImportServerAttribute(
             _('Server'), _('The server you wish to import hosts from'),
             'apiServer', $filter
diff --git a/systems/admin/systems/class_systemManagement.inc b/systems/admin/systems/class_systemManagement.inc
index 2937511d47020e6f628cd53f7a5571730259db24..6db16ef46ee2ad3e20a8a907563f752403e45506 100644
--- a/systems/admin/systems/class_systemManagement.inc
+++ b/systems/admin/systems/class_systemManagement.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003  Cajus Pollmeier
@@ -20,43 +19,58 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class systemManagement extends management
+class systemManagement extends simpleManagement
 {
-  // Tab definition
-  protected $tabClass         = "";
-  protected $tabType          = "";
-  protected $aclCategory      = "";
-  protected $aclPlugin        = "";
-  protected $objectName       = "system";
-  protected $objectInfo       = array();
+  protected $objectTypes  = array('server','workstation','terminal','printer','component','phone','mobilePhone');
+
+  protected $departmentBrowser      = TRUE;
+  protected $departmentRootVisible  = FALSE;
+  protected $baseMode               = TRUE;
+  protected $multiSelect            = TRUE;
+
+  protected $autoFilter       = TRUE;
+  protected $autoActions      = TRUE;
+
+  protected $autoFilterAttributes = array('dn', 'cn', 'description', 'ipHostNumber', 'macAddress', 'gotoMode', 'FAIstate', 'FAIclass');
+
+  public static $skipTemplates = FALSE;
+
+  protected $siActive = FALSE;
+
+  static function plInfo()
+  {
+    return array(
+      'plShortName'   => _('Systems'),
+      'plDescription' => _('Systems Management'),
+      'plIcon'        => 'geticon.php?context=devices&icon=computer&size=48',
+      'plSelfModify'  => FALSE,
+      'plSection'     => array('systems' => array('name' => _('Systems'), 'priority' => 10)),
+      'plPriority'    => 0,
+      'plManages'     => array('server','workstation','terminal','printer','component','phone','mobilePhone'),
+
+      'plProvidedAcls'  => array()
+    );
+  }
 
   function __construct()
   {
+    $this->listXMLPath    = get_template_path('system-list.xml', TRUE, dirname(__FILE__));
 
-    // Set storage points
-    $typeDefs = $this->getObjectDefinitions();
-    $sP = array();
-    foreach ($typeDefs as $entry) {
-      if (!empty($entry['ou'])) {
-        $sP[] = $entry['ou'];
-      }
+    // Check if we are able to communicate with Argonaut server
+    if (class_available('supportDaemon') && class_available('argonautAction')) {
+      $o = new supportDaemon();
+      $this->siActive = $o->is_available();
     }
-    $this->storagePoints = array_unique($sP);
 
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")) {
-      $filter = session::global_get(get_class($this)."_filter");
-    } else {
-      $filter = new filter(get_template_path("system-filter.xml", TRUE));
-      $filter->setObjectStorage($this->storagePoints);
-    }
-    $this->setFilter($filter);
+    parent::__construct();
+  }
+
+  function configureHeadpage ()
+  {
+    parent::configureHeadpage();
 
-    // Build headpage
-    $headpage = new listing(get_template_path("system-list.xml", TRUE));
-    $headpage->registerElementFilter("systemRelease", "systemManagement::systemRelease");
-    $headpage->registerElementFilter("listServices", "systemManagement::listServices");
-    $headpage->setFilter($filter);
+    $this->headpage->registerElementFilter('systemRelease', 'systemManagement::systemRelease');
+    $this->headpage->registerElementFilter('listServices',  'systemManagement::listServices');
 
     // Register Daemon Events
     if (class_available('argonautAction') && class_available('supportDaemon')) {
@@ -64,15 +78,15 @@ class systemManagement extends management
       $this->headpage->xmlData['actionmenu']['action'][3]['action'] = array();
       $events = argonautEventTypes::get_event_types();
       foreach ($events as $name => $data) {
-        $this->registerAction("T_".$name, "handleEvent");
-        $headpage->xmlData['actionmenu']['action'][2]['action'][] = array(
+        $this->registerAction('T_'.$name, 'handleEvent');
+        $this->headpage->xmlData['actionmenu']['action'][2]['action'][] = array(
         'name' => 'T_'.$name,
         'type' => 'entry',
         'image' => $data['img'],
         'label' => $data['name'],
         );
-        $this->registerAction("S_".$name, "handleEvent");
-        $headpage->xmlData['actionmenu']['action'][3]['action'][] = array(
+        $this->registerAction('S_'.$name, 'handleEvent');
+        $this->headpage->xmlData['actionmenu']['action'][3]['action'][] = array(
         'name' => 'S_'.$name,
         'type' => 'entry',
         'image' => $data['img'],
@@ -80,47 +94,11 @@ class systemManagement extends management
         );
       }
     } else {
-      unset($headpage->xmlData['actionmenu']['action'][2]);
-      unset($headpage->xmlData['actionmenu']['action'][3]);
-      $headpage->xmlData['actionmenu']['action'] = array_values($headpage->xmlData['actionmenu']['action']);
-    }
-    $this->registerAction("saveEvent", "saveEventDialog");
-
-    foreach (array_keys($typeDefs) as $type) {
-      $this->registerAction("new_$type",         "newEntry");
-    }
-
-    parent::__construct("systems", $headpage);
-  }
-
-  /*! \brief  This method is used to queue and process copy&paste actions.
-   *          Allows to copy, cut and paste mutliple entries at once.
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
-   */
-  function copyPasteHandler($action = "", $target = array(), $all = array(),
-      $altTabClass = "", $altTabType = "", $altAclCategory = "", $altAclPlugin = "")
-  {
-    $tDefs    = $this->getObjectDefinitions();
-
-    $tabClass     = array();
-    $tabType      = array();
-    $aclCategory  = array();
-    $aclPlugin    = array();
-
-    $headpage = $this->getHeadpage();
-
-    foreach ($target as $dn) {
-      $type   = $headpage->getType($dn);
-
-      $tabClass[$dn]    = $tDefs[$type]['tabClass'];
-      $tabType[$dn]     = $tDefs[$type]['tabDesc'];
-      $aclCategory[$dn] = $tDefs[$type]['aclCategory'];
-      $aclPlugin[$dn]   = $tDefs[$type]['aclClass'];
+      unset($this->headpage->xmlData['actionmenu']['action'][2]);
+      unset($this->headpage->xmlData['actionmenu']['action'][3]);
+      $this->headpage->xmlData['actionmenu']['action'] = array_values($this->headpage->xmlData['actionmenu']['action']);
     }
-
-    return parent::copyPasteHandler($action, $target, $all, $tabClass, $tabType, $aclCategory, $aclPlugin);
+    $this->registerAction('saveEvent', 'saveEventDialog');
   }
 
   function configureFilter ()
@@ -133,67 +111,69 @@ class systemManagement extends management
   /*! \brief    Handle Argonaut events
    *            All schedules and triggered events are handled here.
    */
-  function handleEvent($action = "", $target = array(), $all = array())
+  function handleEvent($action, array $target)
   {
     // Detect whether this event is scheduled or triggered.
     $triggered = TRUE;
-    if (preg_match("/^S_/", $action)) {
+    if (preg_match('/^S_/', $action)) {
       $triggered = FALSE;
     }
 
     // Detect triggered or scheduled actions
     $headpage = $this->getHeadpage();
-    $event = preg_replace("/^[TS]_/", "", $action);
+    $event = preg_replace('/^[TS]_/', '', $action);
 
     // Now send FAI/Argonaut events here.
-    $mac = array();
-
-    // Collect target mac addresses
-    $events   = argonautEventTypes::get_event_types();
-    $o_queue  = new supportDaemon();
-    foreach ($target as $dn) {
-      $obj = $headpage->getEntry($dn);
-      if (isset($obj['macAddress'][0])) {
-        $mac[] = $obj['macAddress'][0];
-      } else {
-        msg_dialog::display(_('Action canceled'), sprintf(_('System %s has no mac address defined, cannot trigger action'), $dn), ERROR_DIALOG);
+    if ($this->siActive) {
+      $mac = array();
+
+      // Collect target mac addresses
+      $events   = argonautEventTypes::get_event_types();
+      $o_queue  = new supportDaemon();
+      foreach ($target as $dn) {
+        $obj = $headpage->getEntry($dn);
+        if (isset($obj['macAddress'][0])) {
+          $mac[] = $obj['macAddress'][0];
+        } else {
+          msg_dialog::display(_('Action canceled'), sprintf(_('System %s has no mac address defined, cannot trigger action'), $dn), ERROR_DIALOG);
+        }
       }
-    }
 
-    if ((count($mac) == 0) && $triggered) {
-      return;
-    }
+      if ((count($mac) == 0) && $triggered) {
+        return;
+      }
 
-    /* Skip installation or update trigerred events,
-     *  if this entry is currently processing.
-     */
-    if ($triggered && in_array($event, array("reinstall","update"))) {
-      foreach ($mac as $key => $mac_address) {
-        if ($o_queue->is_currently_installing($mac_address)) {
-          msg_dialog::display(_('Action canceled'), sprintf(_('System %s is currently installing'), $dn), ERROR_DIALOG);
-          unset($mac[$key]);
-          logging::log('security', 'systems/'.get_class($this), '', array(), 'Skip adding "argonautAction::'.$type.'" for mac "'.$mac_address.'", there is already a job in progress.');
+      /* Skip installation or update trigerred events,
+       *  if this entry is currently processing.
+       */
+      if ($triggered && in_array($event, array('reinstall','update'))) {
+        foreach ($mac as $key => $mac_address) {
+          if ($o_queue->is_currently_installing($mac_address)) {
+            msg_dialog::display(_('Action canceled'), sprintf(_('System %s is currently installing'), $dn), ERROR_DIALOG);
+            unset($mac[$key]);
+            logging::log('security', 'systems/'.get_class($this), '', array(), 'Skip adding "argonautAction::'.$event.'" for mac "'.$mac_address.'", there is already a job in progress.');
+          }
         }
       }
-    }
 
-    // Prepare event to be added
-    if (isset($events[$event])) {
-      $this->dialogObject = new argonautAction($event);
-      $this->dialogObject->targets = $mac;
-
-      if ($triggered) {
-        $this->dialogObject->scheduled = FALSE;
-        $res = $o_queue->append($this->dialogObject);
-        if ($o_queue->is_error()) {
-          msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
-          $this->closeDialogs();
+      // Prepare event to be added
+      if (isset($events[$event]) && $this->siActive) {
+        $this->dialogObject = new argonautAction($event);
+        $this->dialogObject->targets = $mac;
+
+        if ($triggered) {
+          $this->dialogObject->scheduled = FALSE;
+          $res = $o_queue->append($this->dialogObject);
+          if ($o_queue->is_error()) {
+            msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
+            $this->closeDialogs();
+          } else {
+            msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
+            $this->closeDialogs();
+          }
         } else {
-          msg_dialog::display(_('Action triggered'), sprintf(_('Action called without error (result was "%s")'), $res), INFO_DIALOG);
-          $this->closeDialogs();
+          $this->dialogObject->scheduled = TRUE;
         }
-      } else {
-        $this->dialogObject->scheduled = TRUE;
       }
     }
   }
@@ -208,434 +188,68 @@ class systemManagement extends management
       msg_dialog::displayChecks($msgs);
       return;
     }
-    $o_queue = new supportDaemon();
-    $o_queue->append($this->dialogObject);
-    if ($o_queue->is_error()) {
-      msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
-      $this->closeDialogs();
-    } else {
-      $this->closeDialogs();
-    }
-  }
-
-  /*! \brief    Queue selected objects to be removed.
-   *            Checks ACLs, Locks and ask for confirmation.
-   */
-  protected function removeEntryRequested($action = "", $target = array(), $all = array())
-  {
-    global $ui;
-    $disallowed = array();
-    $this->dns  = array();
-
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removel requested!");
-
-    // Check permissons for each target
-    $tInfo    = $this->getObjectDefinitions();
-    $headpage = $this->getHeadpage();
-    foreach ($target as $dn) {
-      $type = $headpage->getType($dn);
-      if (!isset($tInfo[$type])) {
-        trigger_error("Unknown object type received '".$type."' please update systemManagement::getObjectDefinitions()!");
+    if ($this->siActive) {
+      $o_queue = new supportDaemon();
+      $o_queue->append($this->dialogObject);
+      if ($o_queue->is_error()) {
+        msg_dialog::display(_('Infrastructure service'), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
+        $this->closeDialogs();
       } else {
-        $info = $tInfo[$type];
-        $acl  = $ui->get_permissions($dn, $info['aclCategory']."/".$info['aclClass']);
-        if (preg_match("/d/", $acl)) {
-          $this->dns[] = $dn;
-        } else {
-          $disallowed[] = $dn;
-        }
-      }
-    }
-    if (count($disallowed)) {
-      msg_dialog::display(_("Permission"), msgPool::permDelete($disallowed), INFO_DIALOG);
-    }
-
-    // We've at least one entry to delete.
-    if (count($this->dns)) {
-      // check locks
-      if ($locks = get_locks($this->dns)) {
-        return gen_locked_message($locks, $this->dns);
-      }
-
-      // Add locks
-      $dns_names = array();
-      foreach ($this->dns as $dn) {
-        $dns_names[] = LDAP::fix($dn);
+        $this->closeDialogs();
       }
-      add_lock ($this->dns, $ui->dn);
-
-      // Display confirmation dialog.
-      $smarty = get_smarty();
-      $smarty->assign("info", msgPool::deleteInfo($dns_names, _($this->objectName)));
-      $smarty->assign("multiple", TRUE);
-      return $smarty->fetch(get_template_path('remove.tpl', TRUE));
     }
   }
-
-
-  /*! \brief  Object removal was confirmed, now remove the requested entries.
-   *
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
-   */
-  function removeEntryConfirmed($action = "", $target = array(), $all = array(),
-      $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    global $config, $ui;
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Entry removel confirmed!");
-
-    // Check permissons for each target
-    $tInfo = $this->getObjectDefinitions();
-    $headpage = $this->getHeadpage();
-    $disallowed = array();
-    foreach ($this->dns as $dn) {
-      $type = $headpage->getType($dn);
-      if (!isset($tInfo[$type])) {
-        trigger_error("Unknown object type received '".$type."' please update systemManagement::getObjectDefinitions()!");
-      } else {
-
-        $info = $tInfo[$type];
-        $acl = $ui->get_permissions($dn, $info['aclCategory']."/".$info['aclClass']);
-        if (preg_match("/d/", $acl)) {
-
-          // Delete the object
-          $this->dn = $dn;
-          if ($info['tabClass'] == "phonetabs") {
-             $this->tabObject = new $info['tabClass'](NULL, $config->data['TABS'][$info['tabDesc']], $dn,$type);
-             $this->tabObject->set_acl_base($dn);
-             $this->tabObject->by_object['phoneGeneric']->remove_from_parent ();
-          } else {
-            $this->tabObject = new $info['tabClass'](NULL, $config->data['TABS'][$info['tabDesc']],
-                $this->dn, $info['aclCategory']);
-            $this->tabObject->set_acl_base($this->dn);
-            $this->tabObject->parent = $this;
-            $this->tabObject->delete ();
-          }
-
-          // Remove the lock for the current object.
-          del_lock($this->dn);
-
-        } else {
-          $disallowed[] = $dn;
-          logging::log('security', 'system/'.get_class($this), $dn, array(), 'Tried to trick deletion.');
-        }
-      }
-    }
-    if (count($disallowed)) {
-      msg_dialog::display(_("Permission"), msgPool::permDelete($disallowed), INFO_DIALOG);
-    }
-
-    // Cleanup
-    $this->remove_lock();
-    $this->closeDialogs();
-  }
-
-
-  /*! \brief  Edit the selected system type. */
-  function editEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    if (count($target) == 1) {
-      $tInfo    = $this->getObjectDefinitions();
-      $headpage = $this->getHeadpage();
-      $dn       = $target[0];
-      $type     = $headpage->getType($dn);
-      $tData    = $tInfo[$type];
-
-      $str = management::editEntry($action, $target, $all, $tData['tabClass'], $tData['tabDesc'], $tData['aclCategory']);
-      if ($str) {
-        return $str;
-      }
-      if (isset($all['subaction'])) {
-        if (preg_match('/^tab_([a-zA-Z_]+)$/', $all['subaction'], $m)) {
-          $tab = $m[1];
-          if (isset($this->tabObject->by_object[$tab])) {
-            $this->tabObject->current = $tab;
-          } else {
-            trigger_error('Unknown tab: '.$tab);
-          }
-        } elseif (preg_match('/^service_([a-zA-Z_]+)$/', $all['subaction'], $m)) {
-          $service = $m[1];
-          if (isset($this->tabObject->by_object['ServerService'])) {
-            $this->tabObject->current = 'ServerService';
-            $all = array('action'  => 'edit', 'targets' => array($service));
-            $this->tabObject->by_object['ServerService']->editEntry($all['action'], $all['targets'], $all);
-          } else {
-            trigger_error("Unknown tab: ServerService");
-          }
-        }
-      }
-    }
-  }
-
-
-  /*! \brief  Edit the selected system type.
-   *
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
-   */
-  function newEntry($action = "", $target = array(), $all = array(), $altTabClass = "", $altTabType = "", $altAclCategory = "")
-  {
-    $tInfo = $this->getObjectDefinitions();
-    $info = preg_replace("/^new_/", "", $action);
-    if (!isset($tInfo[$info])) {
-      trigger_error("Unknown action type '".$action."' cant create a new system!");
-    } else {
-      return management::newEntry(
-        $action, $target, $all,
-        $tInfo[$info]['tabClass'], $tInfo[$info]['tabDesc'], $tInfo[$info]['aclCategory']
-      );
-    }
-  }
-
-  /*! \brief  Opens the snapshot creation dialog for the given target.
-   *
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
-   */
-  function createSnapshotDialog($action = "", $target = array(), $all = array())
-  {
-    global $config, $ui;
-    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $target, "Snaptshot creation initiated!");
-
-    $pInfo    = $this->getObjectDefinitions();
-    $headpage = $this->getHeadpage();
-    if (count($target) == 1) {
-      $this->dn = array_pop($target);
-      if (empty($this->dn)) {
-        return;
-      }
-      $type = $headpage->getType($this->dn);
-      if (!isset($pInfo[$type])) {
-        trigger_error('Unknown system type \''.$type.'\'!');
-        return;
-      }
-
-      if ($ui->allow_snapshot_create($this->dn, $pInfo[$type]['aclCategory'])) {
-        $this->dialogObject = new SnapshotCreateDialog($this->dn, $this, $pInfo[$type]['aclCategory']);
-        $this->dialogObject->set_acl_base($this->dn);
-      } else {
-        msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to create a snapshot for %s.'), $this->dn),
-            ERROR_DIALOG);
-      }
-    }
-  }
-
-
-  /*! \brief  Displays the "Restore snapshot dialog" for a given target.
-   *          If no target is specified, open the restore removed object
-   *           dialog.
-   *  @param  String  'action'  The name of the action which was the used as trigger.
-   *  @param  Array   'target'  A list of object dns, which should be affected by this method.
-   *  @param  Array   'all'     A combination of both 'action' and 'target'.
-   */
-  function restoreSnapshotDialog($action = "", $target = array(), $all = array())
-  {
-    global $ui;
-    // Set current restore base for snapshot handling.
-    $pInfo    = $this->getObjectDefinitions();
-
-    // Set current restore base for snapshot handling.
-    if (is_object($this->snapHandler)) {
-      $bases = array();
-      foreach ($this->storagePoints as $sp) {
-        $bases[] = $sp.$this->headpage->getBase();
-      }
-    }
-
-    // No bases specified? Try base
-    if (!count($bases)) $bases[] = $this->headpage->getBase();
-
-
-    // No target, open the restore removed object dialog.
-    if (!count($target)) {
-      $cats = array();
-      foreach ($pInfo as $data) {
-        $cats[] = $data['aclCategory'];
-      }
-      $cats = array_unique($cats);
-
-      $this->dn = $this->headpage->getBase();
-    } else {
-      // Display the restore points for a given object.
-      $this->dn = reset($target);
-      $entry    = $this->headpage->getEntry($this->dn);
-      $type     = $this->headpage->getType($this->dn);
-      if (!isset($pInfo[$type])) {
-        trigger_error('Unknown system type \''.$type.'\'!');
-        return;
-      }
-
-      $cats = $pInfo[$type]['aclCategory'];
-    }
-    if (empty($this->dn)) {
-      return;
-    }
-
-    if ($ui->allow_snapshot_restore($this->dn, $cats)) {
-      @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $this->dn, 'Snaptshot restoring initiated!');
-      $this->snapHandler->setSnapshotBases($bases);
-      $this->dialogObject = new SnapshotRestoreDialog($this->dn, $this, !count($target), $cats);
-      $this->dialogObject->set_acl_base($this->dn);
-    } else {
-      msg_dialog::display(_('Permission'), sprintf(_('You are not allowed to restore a snapshot for %s.'), $this->dn),
-          ERROR_DIALOG);
-    }
-  }
-
   /*! \brief  Detects actions/events send by the ui
    *           and the corresponding targets.
    */
   function detectPostActions()
   {
-    $action = management::detectPostActions();
-    if (isset($_POST['abort_event_dialog']))  $action['action'] = "cancel";
-    if (isset($_POST['save_event_dialog']))  $action['action'] = "saveEvent";
-
-    if (isset($_POST['new_goServer']))  $action['action'] = "new_goServer";
-    if (isset($_POST['new_gotoWorkstation']))  $action['action'] = "new_gotoWorkstation";
-    if (isset($_POST['new_gotoTerminal']))  $action['action'] = "new_gotoTerminal";
-    if (isset($_POST['new_sambaSamAccount']))  $action['action'] = "new_sambaSamAccount";
-    if (isset($_POST['new_fdPrinter']))  $action['action'] = "new_fdPrinter";
-    if (isset($_POST['new_fdPhone']))  $action['action'] = "new_fdPhone";
-    if (isset($_POST['new_ieee802Device']))  $action['action'] = "new_ieee802Device";
-
+    $action = parent::detectPostActions();
+    if (isset($_POST['save_event_dialog'])) {
+      $action['action'] = 'saveEvent';
+    } elseif (isset($_POST['abort_event_dialog'])) {
+      $action['action'] = 'cancel';
+    }
     return $action;
   }
 
-
-  /*! \brief   Overridden render method of class management.
-   *            this allows us to add a release selection box.
-   */
-  function renderList()
+  function handleSubAction($all)
   {
-    $headpage = $this->getHeadpage();
-    $headpage->update();
-
-    $tD     = $this->getObjectDefinitions();
-    $smarty = get_smarty();
-    foreach ($tD as $name => $obj) {
-      $smarty->assign("USE_".$name, (empty($obj['tabClass']) || class_available($obj['tabClass'])));
+    if (parent::handleSubAction($all)) {
+      return TRUE;
+    } elseif (preg_match('/^service_([a-zA-Z_]+)$/', $all['subaction'], $m)) {
+      $service = $m[1];
+      if (isset($this->tabObject->by_object['ServerService'])) {
+        $this->tabObject->current = 'ServerService';
+        $all = array('action'  => 'edit', 'targets' => array($service));
+        $this->tabObject->by_object['ServerService']->editEntry($all['action'], $all['targets'], $all);
+      } else {
+        trigger_error("Unknown tab: ServerService");
+      }
+      return TRUE;
     }
-
-    $display = $headpage->render();
-    return $this->getHeader().$display;
+    return FALSE;
   }
 
-
-  public function getObjectDefinitions()
-  {
-    $tabs = array(
-      'goServer' => array(
-        'ou'          => get_ou('serverRDN'),
-        'plugClass'   => 'serverGeneric',
-        'tabClass'    => 'servtabs',
-        'tabDesc'     => 'SERVERTABS',
-        'aclClass'    => 'serverGeneric',
-        'sendEvents'  => TRUE,
-        'aclCategory' => 'server'
-      ),
-      'gotoWorkstation' => array(
-        'ou'          => get_ou('workstationRDN'),
-        'plugClass'   => 'workstationGeneric',
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'WORKSTATIONTABS',
-        'aclClass'    => 'workstationGeneric',
-        'sendEvents'  => TRUE,
-        'aclCategory' => 'workstation'
-      ),
-      'gotoTerminal' => array(
-        'ou'          => get_ou('terminalRDN'),
-        'plugClass'   => 'terminalGeneric',
-        'tabClass'    => 'simpleTabs',
-        'sendEvents'  => TRUE,
-        'tabDesc'     => 'TERMINALTABS',
-        'aclClass'    => 'terminalGeneric',
-        'aclCategory' => 'terminal'
-      ),
-      'fdPrinter' => array(
-        'ou'          => get_ou('printerRDN'),
-        'plugClass'   => 'printGeneric',
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'PRINTERTABS',
-        'aclClass'    => 'printGeneric',
-        'sendEvents'  => FALSE,
-        'aclCategory' => 'printer'
-      ),
-      'fdPhone' => array(
-        'ou'          => get_ou('phoneRDN'),
-        'plugClass'   => 'phoneGeneric',
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'PHONETABS',
-        'sendEvents'  => FALSE,
-        'aclClass'    => 'phoneGeneric',
-        'aclCategory' => 'phone'
-      ),
-      'sambaSamAccount' => array(
-        'ou'          => get_winstations_ou(),
-        'plugClass'   => 'winstationGeneric',
-        'sendEvents'  => TRUE,
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'WINSTATIONTABS',
-        'aclClass'    => 'winstationGeneric',
-        'aclCategory' => 'winstation'
-      ),
-      'ieee802Device' => array(
-        'ou'          => get_ou('componentRDN'),
-        'plugClass'   => 'componentGeneric',
-        'sendEvents'  => FALSE,
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'COMPONENTTABS',
-        'aclClass'    => 'componentGeneric',
-        'aclCategory' => 'component'
-      ),
-      'fdMobilePhone'   => array(
-        'ou'          => get_ou('mobilePhoneRDN'),
-        'plugClass'   => 'mobilePhoneGeneric',
-        'tabClass'    => 'simpleTabs',
-        'tabDesc'     => 'MOBILEPHONETABS',
-        'aclClass'    => 'mobilePhoneGeneric',
-        'sendEvents'  => FALSE,
-        'aclCategory' => 'mobilePhone'
-      ),
-    );
-
-    // Now map some special types
-    $tabs['gotoWorkstation__IS_BUSY']     = &$tabs['gotoWorkstation'];
-    $tabs['gotoWorkstation__IS_ERROR']    = &$tabs['gotoWorkstation'];
-    $tabs['gotoWorkstation__IS_LOCKED']   = &$tabs['gotoWorkstation'];
-    $tabs['gotoTerminal__IS_BUSY']        = &$tabs['gotoTerminal'];
-    $tabs['gotoTerminal__IS_ERROR']       = &$tabs['gotoTerminal'];
-    $tabs['gotoTerminal__IS_LOCKED']      = &$tabs['gotoTerminal'];
-    $tabs['goServer__IS_BUSY']            = &$tabs['goServer'];
-    $tabs['goServer__IS_ERROR']           = &$tabs['goServer'];
-    $tabs['goServer__IS_LOCKED']          = &$tabs['goServer'];
-
-    return $tabs;
-  }
-
-
   static function systemRelease($a, $b, $c, $objectclasses = NULL, $class = NULL)
   {
     global $config;
 
     // No objectclasses set - go ahead
     if (!$objectclasses) {
-      return "&nbsp;";
+      return '&nbsp;';
     }
 
     // Skip non fai objects
-    if (!in_array_ics("FAIobject", $objectclasses)) {
-      return "&nbsp;";
+    if (!in_array_ics('FAIobject', $objectclasses)) {
+      return '&nbsp;';
     }
 
     // If we've an own fai class, just use this
     if ($class && is_array($class)) {
       foreach (explode(' ', $class[0]) as $element) {
-        if ($element[0] == ":") {
-          return "&nbsp;".htmlentities(mb_substr($element, 1), ENT_COMPAT, 'UTF-8');
+        if ($element[0] == ':') {
+          return '&nbsp;'.htmlentities(mb_substr($element, 1), ENT_COMPAT, 'UTF-8');
         }
       }
     }
@@ -643,17 +257,17 @@ class systemManagement extends management
     // Load information if needed
     $ldap = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
-    $ldap->search("(&(objectClass=gosaGroupOfNames)(FAIclass=*)(member=".$b."))", array('FAIclass','cn'));
+    $ldap->search('(&(objectClass=gosaGroupOfNames)(FAIclass=*)(member='.$b.'))', array('FAIclass','cn'));
     while ($attrs = $ldap->fetch()) {
-      $rel = htmlentities(preg_replace("/^.*:/", "", $attrs['FAIclass'][0]), ENT_COMPAT, 'UTF-8');
-      $sys = htmlentities(sprintf(_("Inherited from %s"), $attrs['cn'][0]), ENT_COMPAT, 'UTF-8');
-      $str = "&nbsp;<img class='center' src='plugins/ogroups/images/ogroup.png'
-          title='".$sys."'
-          alt='".$sys."' >&nbsp;".$rel;
+      $rel = htmlentities(preg_replace('/^.*:/', '', $attrs['FAIclass'][0]), ENT_COMPAT, 'UTF-8');
+      $sys = htmlentities(sprintf(_('Inherited from %s'), $attrs['cn'][0]), ENT_COMPAT, 'UTF-8');
+      $str = '&nbsp;<img class="center" src="plugins/ogroups/images/ogroup.png"
+          title="'.$sys.'"
+          alt="'.$sys.'"/>&nbsp;'.$rel;
       return $str;
     }
 
-    return "&nbsp;";
+    return '&nbsp;';
   }
 
   static function listServices($row, $dn, $attrs)
@@ -677,9 +291,9 @@ class systemManagement extends management
         if ($service->is_this_account($attrs)) {
           $infos = pluglist::pluginInfos($class);
           if (isset($infos['plIcon'])) {
-            $services_imgs[] = "<input class='center' type='image' src='".$infos['plIcon']."' ".
-                               "alt='".$infos['plShortName']."' title='".$infos['plShortName']."' ".
-                               "name='listing_edit_service_".$class."_$row' style='padding:1px'/>";
+            $services_imgs[] = '<input class="center" type="image" src="'.$infos['plIcon'].'" '.
+                               'alt="'.$infos['plShortName'].'" title="'.$infos['plShortName'].'" '.
+                               'name="listing_edit_service_'.$class.'_'.$row.'"/>';
           } else {
             @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $infos['plShortName']." ($class)", "No icon for");
           }
@@ -687,27 +301,11 @@ class systemManagement extends management
       }
     }
 
-    $str = implode("", $services_imgs);
-    if ($str == "") {
-      $str = "&nbsp;";
+    $str = implode('', $services_imgs);
+    if ($str == '') {
+      $str = '&nbsp;';
     }
     return $str;
   }
-
-  static function plInfo()
-  {
-    return array(
-      'plShortName'   => _('Systems'),
-      'plDescription' => _('Systems Management'),
-      'plIcon'        => 'geticon.php?context=devices&icon=computer&size=48',
-      'plSelfModify'  => FALSE,
-      'plSection'     => array('systems' => array('name' => _('Systems'), 'priority' => 10)),
-      'plPriority'    => 0,
-      'plCategory'    => array('terminal','workstation','server','phone','printer','component','winstation'),
-      'plManages'     => array('terminal','workstation','server','phone','printer','component','winstation'),
-
-      'plProvidedAcls'  => array()
-    );
-  }
 }
 ?>
diff --git a/systems/admin/systems/class_terminalGeneric.inc b/systems/admin/systems/class_terminalGeneric.inc
index eee8ae4a9e6e06b4742be17b7b29bf8865a8860d..6ff8b850cbedc3618b677cb2e448a2fc3f7fc0ad 100644
--- a/systems/admin/systems/class_terminalGeneric.inc
+++ b/systems/admin/systems/class_terminalGeneric.inc
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2012-2016  FusionDirectory
@@ -21,9 +20,21 @@
 
 class terminalGeneric extends workstationGeneric
 {
-  var $objectclasses = array('top', 'gotoTerminal', 'GOhard');
+  var $objectclasses = array('fdTerminal', 'ipHost', 'ieee802Device');
 
-  var $inheritance = array('gotoWorkstationTemplate' => 'member', 'gotoTerminalTemplate' => 'member');
+  /*!
+   *  \brief The main function : information about attributes
+   */
+  static function getAttributesInfo ($word = NULL, $rdn = NULL)
+  {
+    if ($word === NULL) {
+      $word = _('terminal');
+    }
+    if ($rdn === NULL) {
+      $rdn = get_ou('terminalRDN');
+    }
+    return parent::getAttributesInfo($word, $rdn);
+  }
 
   /* Return plugin information for acl handling */
   static function plInfo()
@@ -36,7 +47,7 @@ class terminalGeneric extends workstationGeneric
         array(
           'name'        => _('Terminal'),
           'description' => _('Terminal'),
-          'filter'      => 'objectClass=gotoTerminal',
+          'filter'      => 'objectClass=fdTerminal',
           'icon'        => 'geticon.php?context=devices&icon=terminal&size=16',
           'ou'          => get_ou('terminalRDN'),
         )
@@ -45,32 +56,6 @@ class terminalGeneric extends workstationGeneric
       'plProvidedAcls'  => parent::generatePlProvidedAcls(static::getAttributesInfo())
     );
   }
-
-  /*!
-   *  \brief The main function : information about attributes
-   */
-  static function getAttributesInfo ($word = NULL, $rdn = NULL)
-  {
-    if ($word === NULL) {
-      $word = _('terminal');
-    }
-    if ($rdn === NULL) {
-      $rdn = get_ou('terminalRDN');
-    }
-    return parent::getAttributesInfo($word, $rdn);
-  }
-
-  function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
-  {
-    global $config;
-    parent::__construct($dn, $object, $parent, $mainTab);
-  }
-
-  /* Returns the dn of the entry */
-  function compute_dn()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('terminalRDN').$this->base;
-  }
 }
 
 ?>
diff --git a/systems/admin/systems/class_terminalStartup.inc b/systems/admin/systems/class_terminalStartup.inc
index 1482e778d77cadf78885a5748fac98ec2bb32a8b..ec2e58f342ead9e5962293b8539a0ab707588f3d 100644
--- a/systems/admin/systems/class_terminalStartup.inc
+++ b/systems/admin/systems/class_terminalStartup.inc
@@ -84,7 +84,6 @@ class terminalStartup extends simplePlugin
 
   function __construct ($dn = NULL, $object = NULL, $parent = NULL, $mainTab = FALSE)
   {
-    global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
 
     $this->attributesAccess['gotoXMethod']->setSubmitForm('updateServerList');
diff --git a/systems/admin/systems/class_workstationGeneric.inc b/systems/admin/systems/class_workstationGeneric.inc
index 4a631253f91d6e756dd600518bc8319ed96becc7..f84b53a3a3d5133c53061ca234a3a3b9b4d27ca6 100644
--- a/systems/admin/systems/class_workstationGeneric.inc
+++ b/systems/admin/systems/class_workstationGeneric.inc
@@ -20,107 +20,12 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-class systemSimplePluginGlue extends simplePlugin
+class workstationGeneric extends simplePlugin
 {
-  protected $previousNetworkSavedAttributes;
+  var $mainTab = TRUE;
 
-  public function __get($name)
-  {
-    if ($name == 'ipHostNumber') {
-      return array_merge(array($this->netConfigDNS->$name), $this->netConfigDNS->additionalHostNumbers);
-    } elseif ($name == 'macAddress') {
-      return $this->netConfigDNS->$name;
-    } else {
-      return parent::__get($name);
-    }
-  }
-
-  public function __set($name, $value)
-  {
-    if ($name == 'ipHostNumber') {
-      if (is_array($value)) {
-        $this->netConfigDNS->$name                  = array_shift($value);
-        $this->netConfigDNS->additionalHostNumbers  = $value;
-      } else {
-        $this->netConfigDNS->$name = $value;
-      }
-    } elseif ($name == 'macAddress') {
-      $this->netConfigDNS->$name = $value;
-    } else {
-      return parent::__set($name, $value);
-    }
-  }
-
-  public function __isset($name)
-  {
-    if (($name == 'ipHostNumber') || ($name == 'macAddress')) {
-      return isset($this->netConfigDNS->$name);
-    } else {
-      return parent::__isset($name);
-    }
-  }
-
-  protected function attributeHaveChanged($field)
-  {
-    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);
-    }
-  }
-
-  protected function attributeValue($field)
-  {
-    if (($field == 'ipHostNumber') || ($field == 'macAddress')) {
-      return $this->$field;
-    } else {
-      return parent::attributeValue($field);
-    }
-  }
-
-  protected function attributeInitialValue($field)
-  {
-    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);
-    }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    $this->previousNetworkSavedAttributes = $this->netConfigDNS->saved_attributes;
-    return parent::ldap_save($cleanup);
-  }
-}
-
-class workstationGeneric extends systemSimplePluginGlue
-{
-  var $netConfigDNS;
-
-  var $objectclasses = array("top", "gotoWorkstation", "GOhard");
+  var $objectclasses = array('fdWorkstation', 'ipHost', 'ieee802Device');
 
-  var $fai_activated = FALSE;
-
-  var $inheritance = array("gotoWorkstationTemplate" => "member");
-
-  var $preInitAttributes = array('cn', 'networkSettings');
-
-  /* Return plugin information for acl handling */
   static function plInfo()
   {
     return array(
@@ -131,7 +36,7 @@ class workstationGeneric extends systemSimplePluginGlue
         array(
           'name'        => _('Workstation'),
           'description' => _('Workstation'),
-          'filter'      => 'objectClass=gotoWorkstation',
+          'filter'      => 'objectClass=fdWorkstation',
           'ou'          => get_ou('workstationRDN'),
           'icon'        => 'geticon.php?context=devices&icon=computer&size=16',
           'mainAttr'    => 'cn',
@@ -141,9 +46,6 @@ class workstationGeneric extends systemSimplePluginGlue
     );
   }
 
-  /*!
-   *  \brief The main function : information about attributes
-   */
   static function getAttributesInfo ($word = NULL, $rdn = NULL)
   {
     if ($word === NULL) {
@@ -156,42 +58,49 @@ class workstationGeneric extends systemSimplePluginGlue
       'main' => array(
         'name'  => _('Properties'),
         'attrs' => array(
+          new BaseSelectorAttribute($rdn),
           new HostNameAttribute (
             _('Name'),
             sprintf(_('The name of the %s'), $word),
-            'cn',
-            TRUE
+            'cn', TRUE
           ),
           new StringAttribute (
             _('Description'),
             sprintf(_('A short description of the %s'), $word),
-            'description',
-            FALSE
+            'description', FALSE
           ),
           new StringAttribute (
             _('Location'),
             sprintf(_('The location of the %s'), $word),
-            'l',
-            FALSE
+            'l', FALSE
           ),
-          new BaseSelectorAttribute($rdn),
           new BooleanAttribute (
             sprintf(_('Lock this %s'), $word),
             sprintf(_('This will prevent the %s from being reinstalled'), $word),
-            'gotoMode',
+            'fdMode',
             FALSE,
             FALSE,
             '',
             'locked',
-            'active'
+            'unlocked'
           ),
         )
       ),
       'network' => array(
         'name'      => _('Network settings'),
-        'template'  => get_template_path('network_section.tpl', TRUE, dirname(__FILE__)),
         'icon'      => 'geticon.php?context=categories&icon=applications-internet&size=16',
-        'attrs'     => array(new NetworkSettingsAttribute()),
+        'attrs'     => array(
+          new SetAttribute(
+            new IPAttribute(
+              _('IP address'), _('IP addresses this system uses (v4 or v6)'),
+              'ipHostNumber', TRUE
+            )
+          ),
+          new MacAddressAttribute(
+            _('Mac address'), _('Mac address of this system'),
+            'macAddress', FALSE
+          ),
+        ),
       ),
     );
   }
@@ -201,95 +110,27 @@ class workstationGeneric extends systemSimplePluginGlue
     parent::__construct($dn, $object, $parent, $mainTab);
 
     $this->attributesAccess['cn']->setUnique(TRUE);
-
-    $this->netConfigDNS->MACisMust = FALSE;
-
-    $this->updateAttributesValues();
-    $this->prepareSavedAttributes();
-  }
-
-  /* Returns the dn of the entry */
-  function compute_dn()
-  {
-    return 'cn='.ldap_escape_dn($this->cn).','.get_ou('workstationRDN').$this->base;
-  }
-
-  function resetCopyInfos()
-  {
-    parent::resetCopyInfos();
-    $this->netConfigDNS->resetCopyInfos();
-  }
-
-  function set_acl_base($base)
-  {
-    parent::set_acl_base($base);
-    $this->netConfigDNS->set_acl_base($base);
-  }
-
-  function set_acl_category($cat)
-  {
-    parent::set_acl_category($cat);
-    $this->netConfigDNS->set_acl_category($cat);
+    $this->attributesAccess['ipHostNumber']->setUnique('whole');
+    $this->attributesAccess['macAddress']->setUnique('whole');
   }
 
   function remove_from_parent()
   {
-    global $config;
     if (!$this->initially_was_account) {
       return;
     }
 
     if ($this->acl_is_removeable()) {
-      $this->netConfigDNS->remove_from_parent();
-
-      parent::remove_from_parent();
-
-      /* Delete references to object groups */
-      $ldap = $config->get_ldap_link();
-      $ldap->cd($config->current['BASE']);
-      $ldap->search("(&(objectClass=gosaGroupOfNames)(member=".ldap_escape_f($this->dn)."))", array("cn"));
-      while ($ldap->fetch()) {
-        $og = new ogroup($ldap->getDN());
-        unset($og->member[$this->dn]);
-        $og->save();
-      }
-
-      /* Remove all accessTo/trust dependencies */
-      update_accessTo($this->cn, "");
+      $errors = parent::remove_from_parent();
 
-      /* Clean queue form entries with this mac
-       */
-      if (class_available("supportDaemon") && tests::is_mac($this->netConfigDNS->orig_macAddress)) {
+      /* Clean queue form entries with this mac */
+      if (class_available('supportDaemon') && tests::is_mac($this->attributesAccess['macAddress']->getInitialValue())) {
         $q = new supportDaemon();
-        $q->clean_queue_from_mac($this->netConfigDNS->orig_macAddress);
+        $q->clean_queue_from_mac($this->attributesAccess['macAddress']->getInitialValue());
       }
-    }
-  }
-
-  protected function ldap_save($cleanup = TRUE)
-  {
-    $activate = ($this->attributesAccess['gotoMode']->hasChanged() &&
-                 $this->attributesAccess['gotoMode']->getValue());
-    parent::ldap_save($cleanup);
-    $this->netConfigDNS->cn = $this->cn;
-    $this->netConfigDNS->save();
 
-    if ($activate && class_available('supportDaemon')) {
-      /* Send installation activation */
-      $events = argonautEventTypes::get_event_types();
-      if (isset($events['installation_activation'])) {
-        $o_queue = new supportDaemon();
-        $o_queue->append_call('installation_activation', array($this->netConfigDNS->macAddress), array());
-        if ($o_queue->is_error()) {
-          msg_dialog::display(_("Infrastructure service"), msgPool::siError($o_queue->get_error()), ERROR_DIALOG);
-        }
-      }
+      return $errors;
     }
   }
-
-  function is_modal_dialog()
-  {
-    return (isset($this->netConfigDNS->dialog) && $this->netConfigDNS->dialog);
-  }
 }
 ?>
diff --git a/systems/admin/systems/network.tpl b/systems/admin/systems/network.tpl
deleted file mode 100644
index 3b0ad9999497103f8a35b1e0d8892aa214342ebe..0000000000000000000000000000000000000000
--- a/systems/admin/systems/network.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<table>
-  <tr>
-    <td style='vertical-align:top;'><LABEL  for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$must}{/if}</LABEL></td>
-    <td>
-{render acl=$ipHostNumberACL}
-      <input  type='text' id="ipHostNumber" name="ipHostNumber" size=25 maxlength=80  value="{$ipHostNumber}">
-{/render}
-    {foreach from=$additionalHostNumbers item=item key=key}
-      <br/>
-{render acl=$ipHostNumberACL}
-      <input size=25 maxlength=80 type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
-{/render}
-{render acl=$ipHostNumberACL}
-      <input type='image' class='center' name='additionalHostNumbers_del_{$key}' src='geticon.php?context=actions&icon=edit-delete&size=16' alt='{msgPool type=delButton}'>
-{/render}
-    {/foreach}
-{render acl=$ipHostNumberACL}
-      <input type='image' class='center' name='additionalHostNumbers_add}' src='geticon.php?context=actions&icon=document-new&size=16' alt='{msgPool type=addButton}'>&nbsp;
-{/render}
-      <br/>
-
-{render acl=$ipHostNumberACL}
-      <input id="propose_ip" type="submit" name="propose_ip" value="{t}Propose ip{/t}" style="display: none;">
-{/render}
-    </td>
-  </tr>
-  <tr>
-    <td><LABEL  for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$must}{/if}</td>
-    <td>
-{render acl=$macAddressACL}
-      <input  type='text' name="macAddress" id="macAddress" size=25 maxlength=80  value="{$macAddress}">
-{/render}
-    </td>
-  </tr>
-</table>
-<input type="hidden" name="network_tpl_posted" value="1"/>
diff --git a/systems/admin/systems/network_section.tpl b/systems/admin/systems/network_section.tpl
deleted file mode 100644
index be0074d58b13815299edf1929d067f0f3a290bcd..0000000000000000000000000000000000000000
--- a/systems/admin/systems/network_section.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="{$sectionId}" class="plugin-section">
-  <span class="legend">
-    {$section}
-  </span>
-  <div>
-    {$attributes.networkSettings.display}
-  </div>
-</div>
diff --git a/systems/admin/systems/remove.tpl b/systems/admin/systems/remove.tpl
deleted file mode 100644
index 16c3294a65c50a3dfc39b988d99725e0ea71eed0..0000000000000000000000000000000000000000
--- a/systems/admin/systems/remove.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div style="font-size:18px;">
- <img alt="" src="geticon.php?context=status&icon=dialog-warning&size=32" align=top>&nbsp;{t}Warning{/t}
-</div>
-<p>
-  {$info}
-  {t}This includes all account data, system access rules, imap settings, etc. for this user. Please double check if your really want to do this since there is no way for FusionDirectory to get your data back.{/t}
-</p>
-
-<p>
- {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
-</p>
-
-<p class="plugbottom">
-  <input type=submit name="delete_confirmed" value="{msgPool type=delButton}">
-  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
-  &nbsp;
-</p>
-
diff --git a/systems/admin/systems/serverService-list.tpl b/systems/admin/systems/serverService-list.tpl
index c0b12daaf9c5fe749129655c5f362e02f88611ea..c014f3fcccb0b8bccb78655e4eb77b9688837341 100644
--- a/systems/admin/systems/serverService-list.tpl
+++ b/systems/admin/systems/serverService-list.tpl
@@ -6,7 +6,7 @@
           <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
         </div>
 
-        <div class="contentboxb">
+        <div class="contentboxb" style="background:white;">
           <table>
             <tbody>
               <tr>
diff --git a/systems/admin/systems/serverService-list.xml b/systems/admin/systems/serverService-list.xml
index 0be4b57b6de60d634a13fd8c82d56dfbf7d2c617..13519d4a83c07d2e8658a6e269ddfb1f933e5bd8 100644
--- a/systems/admin/systems/serverService-list.xml
+++ b/systems/admin/systems/serverService-list.xml
@@ -54,7 +54,7 @@
       <label>Create</label>
 
       <action>
-          <!-- List is generated by serverService constructor -->
+        <!-- List is generated by serverService constructor -->
       </action>
     </action>
 
diff --git a/systems/admin/systems/services/shares/class_serviceShare.inc b/systems/admin/systems/services/shares/class_serviceShare.inc
index 5401e0bc8fad1bf29dada1701e06b4c72c7a6ada..03d06033ec0894a9e9e4940231c85eed0de38f56 100644
--- a/systems/admin/systems/services/shares/class_serviceShare.inc
+++ b/systems/admin/systems/services/shares/class_serviceShare.inc
@@ -73,8 +73,10 @@ class serviceShare extends simpleService
                 ),
               )
             ),
+            // no order
             FALSE,
             array(),
+            // edit button
             TRUE
           )
         )
diff --git a/systems/admin/systems/system-filter.tpl b/systems/admin/systems/system-filter.tpl
deleted file mode 100644
index 2b7821624c0081219c943b42f90e76676d39792e..0000000000000000000000000000000000000000
--- a/systems/admin/systems/system-filter.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  {t}Filter{/t}
- </p>
-</div>
-
-<div class="contentboxb">
-
-  {if $USE_goServer}
-  {$SERVER}<label for="SERVER">&nbsp;{t}Show servers{/t}</label><br>
-  {/if}
-  {if $USE_gotoWorkstation}
-  {$WORKSTATION}<label for="WORKSTATION">&nbsp;{t}Show workstations{/t}</label><br>
-  {/if}
-  {if $USE_gotoTerminal}
-  {$TERMINAL}<label for="TERMINAL">&nbsp;{t}Show terminals{/t}</label><br>
-  {/if}
-  {if $USE_fdPrinter}
-  {$PRINTER}<label for="PRINTER">&nbsp;{t}Show network printer{/t}</label><br>
-  {/if}
-  {if $USE_fdPhone}
-  {$PHONE}<label for="PHONE">&nbsp;{t}Show phones{/t}</label><br>
-  {/if}
-  {if $USE_sambaSamAccount}
-  {$WINSTATION}<label for="WINSTATION">&nbsp;{t}Show windows based workstations{/t}</label><br>
-  {/if}
-  {if $USE_ieee802Device}
-  {$COMPONENT}<label for="COMPONENT">&nbsp;{t}Show network devices{/t}</label><br>
-  {/if}
-  {if $USE_fdMobilePhone}
-  {$MOBILEPHONE}<label for="MOBILEPHONE">&nbsp;{t}Show mobile phones{/t}</label><br>
-  {/if}
-
-  <div style="display:block;width=100%;border-top:1px solid #AAAAAA;"></div>
-
- {$SCOPE}
-
- <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" class="center"/>&nbsp;{t}Name{/t}
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
- </table>
-
- <table  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td style="width:100%;text-align:right;">
-    {$APPLY}
-   </td>
-  </tr>
- </table>
-</div>
diff --git a/systems/admin/systems/system-filter.xml b/systems/admin/systems/system-filter.xml
deleted file mode 100644
index cbd49d484270ec28089388b07e3d317270402467..0000000000000000000000000000000000000000
--- a/systems/admin/systems/system-filter.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<filterdef>
-  <definition>
-    <category>server</category>
-    <template>system-filter.tpl</template>
-    <initial>true</initial>
-  </definition>
-
-  <search>
-    <query>
-      <backend>SYSTEMS</backend>
-      <filter>(&amp;(|$SERVER$WORKSTATION$TERMINAL$PHONE$PRINTER$COMPONENT$WINSTATION$MOBILEPHONE)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>uid</attribute>
-      <attribute>description</attribute>
-      <attribute>gotoMode</attribute>
-      <attribute>FAIstate</attribute>
-      <attribute>FAIclass</attribute>
-      <attribute>macAddress</attribute>
-      <attribute>ipHostNumber</attribute>
-    </query>
-    <scope>auto</scope>
-  </search>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(|(cn=*$*)(uid=*$*))</set>
-    <alphabet>false</alphabet>
-    <autocomplete>
-      <backend>SYSTEMS</backend>
-      <filter>(|(cn=*$NAME*)(uid=*$NAME*))</filter>
-      <attribute>cn</attribute>
-      <attribute>uid</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SERVER</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=goServer)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WORKSTATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoWorkstation)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TERMINAL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoTerminal)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PRINTER</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=fdPrinter)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PHONE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=fdPhone)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WINSTATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=sambaSamAccount)(uid=*\$))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>COMPONENT</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=ieee802Device)(objectClass=device))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>MOBILEPHONE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=fdMobilePhone)</set>
-  </element>
-
-</filterdef>
diff --git a/systems/admin/systems/system-list.xml b/systems/admin/systems/system-list.xml
index f3dbbe7ccb4878f59b8685a15b04d0260d40a1a2..33b5ab94bd573d140bf0ce5a9b13485086e9c6c7 100644
--- a/systems/admin/systems/system-list.xml
+++ b/systems/admin/systems/system-list.xml
@@ -9,99 +9,10 @@
     <template>simple-list.tpl</template>
     <label>List of systems</label>
     <defaultSortColumn>1</defaultSortColumn>
-
-    <objectType>
-      <label>Locked server</label>
-      <objectClass>goServer__IS_LOCKED</objectClass>
-      <category>server</category>
-      <class>serverGeneric</class>
-      <image>plugins/systems/images/server_locked.png</image>
-    </objectType>
-
-    <objectType>
-      <label>Locked workstation</label>
-      <objectClass>gotoWorkstation__IS_LOCKED</objectClass>
-      <category>workstation</category>
-      <class>workstationGeneric</class>
-      <image>plugins/systems/images/workstation_locked.png</image>
-    </objectType>
-
-    <objectType>
-      <label>Locked terminal</label>
-      <objectClass>gotoTerminal__IS_LOCKED</objectClass>
-      <category>terminal</category>
-      <class>terminalGeneric</class>
-      <image>plugins/systems/images/terminal_locked.png</image>
-    </objectType>
-
-    <objectType>
-      <label>Winstation</label>
-      <objectClass>sambaSamAccount</objectClass>
-      <category>winstation</category>
-      <class>winstationGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=computer-windows&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Server</label>
-      <objectClass>goServer</objectClass>
-      <category>server</category>
-      <class>serverGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=server&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Workstation</label>
-      <objectClass>gotoWorkstation</objectClass>
-      <category>workstation</category>
-      <class>workstationGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=computer&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Terminal</label>
-      <objectClass>gotoTerminal</objectClass>
-      <category>terminal</category>
-      <class>terminalGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=terminal&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Printer</label>
-      <objectClass>fdPrinter</objectClass>
-      <category>printer</category>
-      <class>printGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=printer&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Phone</label>
-      <objectClass>fdPhone</objectClass>
-      <category>phone</category>
-      <class>phoneGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=telephone&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Mobile phone</label>
-      <objectClass>fdMobilePhone</objectClass>
-      <category>mobilePhone</category>
-      <class>mobilePhoneGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=phone&amp;size=16</image>
-    </objectType>
-
-    <objectType>
-      <label>Component</label>
-      <objectClass>ieee802Device</objectClass>
-      <category>component</category>
-      <class>componentGeneric</class>
-      <image>geticon.php?context=devices&amp;icon=network-device&amp;size=16</image>
-    </objectType>
-
   </definition>
 
   <table>
-    <layout>|20px;c||90px-d|110px|100px;o||60px;o|170px-d;r|</layout>
+    <layout>|20px;c||90px-d|110px|100px;o|||120px-d;r|</layout>
 
     <department>
       <value>%{filter:departmentType(row,dn)}</value>
@@ -109,7 +20,7 @@
 
     <department>
       <value>%{filter:departmentLink(row,dn,description)}</value>
-      <span>2</span>
+      <span>4</span>
     </department>
 
     <column>
@@ -177,70 +88,6 @@
       <type>sub</type>
       <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
       <label>Create</label>
-
-      <action>
-        <name>new_goServer</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=server&amp;size=16</image>
-        <label>Server</label>
-        <depends>serverGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_gotoWorkstation</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=computer&amp;size=16</image>
-        <label>Workstation</label>
-        <depends>workstationGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_gotoTerminal</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=terminal&amp;size=16</image>
-        <label>Terminal</label>
-        <depends>terminalGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_sambaSamAccount</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=computer-windows&amp;size=16</image>
-        <label>winStation</label>
-        <depends>winstationGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_fdPrinter</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=printer&amp;size=16</image>
-        <label>Network printer</label>
-        <depends>printGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_fdPhone</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=telephone&amp;size=16</image>
-        <label>Phone</label>
-        <depends>phoneGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_ieee802Device</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=network-device&amp;size=16</image>
-        <label>Network device</label>
-        <depends>componentGeneric</depends>
-      </action>
-
-      <action>
-        <name>new_fdMobilePhone</name>
-        <type>entry</type>
-        <image>geticon.php?context=devices&amp;icon=phone&amp;size=16</image>
-        <label>Mobile Phone</label>
-        <depends>mobilePhoneGeneric</depends>
-      </action>
     </action>
 
     <action>
@@ -291,6 +138,15 @@
   </actionmenu>
 
   <actiontriggers snapshot="true" copypaste="true">
+
+    <action>
+      <name>template_apply</name>
+      <type>entry</type>
+      <image>geticon.php?context=actions&amp;icon=document-new&amp;size=16</image>
+      <objectclass>fdTemplate</objectclass>
+      <label>New object from template</label>
+    </action>
+
     <action>
       <name>cp</name>
       <type>copypaste</type>
@@ -306,6 +162,7 @@
     <action>
       <name>snapshot</name>
       <type>snapshot</type>
+      <objectclass>!fdTemplate</objectclass>
     </action>
 
     <action>
diff --git a/systems/admin/systems/tabs_server.inc b/systems/admin/systems/tabs_server.inc
index 075680f90d8c73950cc23c0c6e7b40257a39b048..47046d02e13bf1b9a414cee6c076d66fb5ebb3b1 100644
--- a/systems/admin/systems/tabs_server.inc
+++ b/systems/admin/systems/tabs_server.inc
@@ -23,12 +23,14 @@ class servtabs extends simpleTabs
 {
   function save()
   {
-    parent::save();
+    $errors = parent::save();
 
     /* Reload server settings after saving */
     $config = session::get('config');
     $config->load_servers();
     session::set('config', $config);
+
+    return $errors;
   }
 }
 
diff --git a/systems/contrib/openldap/service-fd.schema b/systems/contrib/openldap/service-fd.schema
index c79fc9345bc08d21fff16a30442cffe08e73be98..6d6a35ffcbc81350310d223b2d01ff742307877a 100644
--- a/systems/contrib/openldap/service-fd.schema
+++ b/systems/contrib/openldap/service-fd.schema
@@ -19,12 +19,6 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.4 NAME 'goExportEntry'
   EQUALITY caseExactMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.9 NAME 'goSyslogSection'
-  DESC 'What sections wants the server for its syslog service? i.e. *.*'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.9.10 NAME 'goTimeSource'
   DESC 'List of time sources'
   EQUALITY caseExactIA5Match
@@ -97,147 +91,6 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.9.21 NAME 'goLdapCrlCheck'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.22 NAME 'goFaxAdmin'
-  DESC 'Admin principal for fax server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.23 NAME 'goFaxPassword'
-  DESC 'Admin password for fax server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.83 NAME 'goLogDB'
-  DESC 'GOsa logging DB name'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.84 NAME 'goLogDriver'
-  DESC 'FD logging MDB2 driver name'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.24 NAME 'goLogAdmin'
-  DESC 'Admin user for log server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.25 NAME 'goLogPassword'
-  DESC 'Admin password for log server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.26 NAME 'goFonAdmin'
-  DESC 'Admin user for fon server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.27 NAME 'goFonPassword'
-  DESC 'Admin password for fon server'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.28 NAME 'goFonAreaCode'
-  DESC 'Store area code'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.29 NAME 'goFonCountryCode'
-  DESC 'Store country code'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.30 NAME 'fdAsteriskDriver'
-  DESC 'Driver used for asterisk DB'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.68 NAME 'avMaxThreads'
-  DESC 'Number of AV scanning threads'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.69 NAME 'avMaxDirectoryRecursions'
-  DESC 'Number of recursions done with directories'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.70 NAME 'avUser'
-  DESC 'Username to run antivirus with'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-# avFlags         D       Debug
-#                 S       Scan Mail
-#                 A       Scan Archive
-#                 E       Archive block encrypted
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.71 NAME 'avFlags'
-  DESC 'Special flags for the antivirus scan engine'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.72 NAME 'avArchiveMaxFileSize'
-  DESC 'Maximum archive file size'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.73 NAME 'avArchiveMaxRecursion'
-  DESC 'Maximum number of archive nestings'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.74 NAME 'avArchiveMaxCompressionRatio'
-  DESC 'Maximum compression ratio'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.75 NAME 'avDatabaseMirror'
-  DESC 'Where to find updates'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.76 NAME 'avHttpProxyURL'
-  DESC 'How to get the updates'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.9.78 NAME 'avChecksPerDay'
-  DESC 'Update checks per day'
-  OBSOLETE
-  EQUALITY integerMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.9.82 NAME 'gotoSessionType'
   DESC 'Supported type of session for a terminal server'
   EQUALITY caseIgnoreIA5Match
@@ -253,27 +106,6 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.16 NAME 'goTerminalServer' SUP top AUXILIAR
   MUST ( cn $ goXdmcpIsEnabled )
   MAY  ( description $ gotoSessionType ))
 
-# NFS Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.19 NAME 'goNfsServer' SUP top AUXILIARY
-  DESC 'NFS server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( goExportEntry $ description ))
-
-# Time Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.20 NAME 'goNtpServer' SUP top AUXILIARY
-  DESC 'Time server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( goTimeSource $ description ))
-
-# Syslog Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.21 NAME 'goSyslogServer' SUP top AUXILIARY
-  DESC 'Syslog server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( goSyslogSection $ description ))
-
 # LDAP Server description
 objectclass (1.3.6.1.4.1.10098.1.2.1.22 NAME 'goLdapServer' SUP top AUXILIARY
   DESC 'LDAP server description'
@@ -282,51 +114,15 @@ objectclass (1.3.6.1.4.1.10098.1.2.1.22 NAME 'goLdapServer' SUP top AUXILIARY
         $ goLdapDeref $ goLdapTlsCert $ goLdapTlsKey $ goLdapTlsCaCert
         $ goLdapReqCert $ goLdapCrlCheck))
 
-# CUPS Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.23 NAME 'goCupsServer' SUP top AUXILIARY
-  DESC 'CUPS server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( description ))
-
-# Fax Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.26 NAME 'goFaxServer' SUP top AUXILIARY
-  DESC 'Fax server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( description $ goFaxAdmin $ goFaxPassword ))
-
 # Common server class
 objectclass (1.3.6.1.4.1.10098.1.2.1.27 NAME 'goServer' SUP top AUXILIARY
   DESC 'Server description'
-  MUST ( cn )
-  MAY  ( description $ macAddress $ ipHostNumber ))
-
-# LogDB Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.28 NAME 'goLogDBServer' SUP top AUXILIARY
-  DESC 'Log DB server description'
   OBSOLETE
   MUST ( cn )
-  MAY ( goLogDriver $ goLogDB $ goLogAdmin $ goLogPassword ))
-
-# Fon Server description
-objectclass (1.3.6.1.4.1.10098.1.2.1.29 NAME 'goFonServer' SUP top AUXILIARY
-  DESC 'Fon server description'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( description $ goFonAdmin $ goFonPassword $ goFonAreaCode $ goFonCountryCode $ fdAsteriskDriver ))
+  MAY  ( description $ macAddress $ ipHostNumber ))
 
 # Share Server description
 objectclass (1.3.6.1.4.1.10098.1.2.1.33 NAME 'goShareServer' SUP top AUXILIARY
   DESC 'Share server description'
   MUST ( cn )
   MAY  ( description $ goExportEntry ))
-
-# Clamav definitions
-objectclass (1.3.6.1.4.1.10098.1.2.1.39 NAME 'goVirusServer' SUP top AUXILIARY
-  DESC 'Virus server definition'
-  OBSOLETE
-  MUST ( cn )
-  MAY  ( avMaxThreads $ avMaxDirectoryRecursions $ avUser $ avFlags $
-         avArchiveMaxFileSize $ avArchiveMaxRecursion $ avArchiveMaxCompressionRatio $
-         avDatabaseMirror $ avChecksPerDay $ avHttpProxyURL ) )
diff --git a/systems/contrib/openldap/systems-fd-conf.schema b/systems/contrib/openldap/systems-fd-conf.schema
index 1d6cd517fbbfde74fe1eb1b9ba5adb7d099f31f2..671b010211034a60d88209664b226efbc5e1af66 100644
--- a/systems/contrib/openldap/systems-fd-conf.schema
+++ b/systems/contrib/openldap/systems-fd-conf.schema
@@ -77,40 +77,6 @@ attributetype ( 1.3.6.1.4.1.38414.18.11.1 NAME 'fdEncodings'
   SUBSTR caseExactIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
-## Crap from asterisk-fd-conf.schema - OBSOLETE to ease migration to 1.0.9
-
-# asterisk-fd-conf.schema Attributes
-
-attributetype ( 1.3.6.1.4.1.38414.19.10.2 NAME 'fdPhoneMacroRDN'
-  DESC 'FusionDirectory - Phone macro RDN'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.38414.19.10.3 NAME 'fdPhoneConferenceRDN'
-  DESC 'FusionDirectory - Phone conference RDN'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.38414.19.11.1 NAME 'fdSipContexts'
-  DESC 'FusionDirectory - available sip contexts'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.38414.19.11.2 NAME 'fdVoicemailContexts'
-  DESC 'FusionDirectory - available voicemail contexts'
-  OBSOLETE
-  EQUALITY caseExactIA5Match
-  SUBSTR caseExactIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
 # Object Class
 
 objectclass ( 1.3.6.1.4.1.38414.18.2.1 NAME 'fdSystemsPluginConf'
@@ -125,8 +91,8 @@ objectclass ( 1.3.6.1.4.1.38414.18.2.1 NAME 'fdSystemsPluginConf'
 
 objectclass ( 1.3.6.1.4.1.38414.19.2.1 NAME 'fdAsteriskPluginConf'
   DESC 'FusionDirectory asterisk plugin configuration'
+  OBSOLETE
   SUP top AUXILIARY
   MUST ( )
-  MAY ( fdPhoneRDN $ fdPhoneMacroRDN $ fdPhoneConferenceRDN $
-        fdSipContexts $ fdVoicemailContexts ) )
+  MAY ( ) )
 
diff --git a/systems/contrib/openldap/systems-fd.schema b/systems/contrib/openldap/systems-fd.schema
index 345774b8da633710e694070a35020abfba7e5afc..a0ff2a8b0dd1b77a3680a671ba7cd1daeef7bc0b 100644
--- a/systems/contrib/openldap/systems-fd.schema
+++ b/systems/contrib/openldap/systems-fd.schema
@@ -4,426 +4,48 @@
 ## Maintained by the FusionDirectory Project <contact@fusiondirectory.org>
 ##
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.7 NAME 'gotoProfileFlags'
-  DESC 'GOto - Flags for Profile handling - C is for caching'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.8 NAME 'gotoProfileServer'
-  DESC 'GOto - specifies the profile server'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.9 NAME 'gotoShare'
-  DESC 'GOto - specifies a share'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.15 NAME 'gotoProfileQuota'
-  DESC 'GOto - save quota for home'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.4 NAME 'gotoLpdServer'
-  DESC 'GOto - Gonicus Terminal Concept, value lpdServer.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.5 NAME 'gotoFontPath'
-  DESC 'GOto - Gonicus Terminal Concept, value fontPath.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.6 NAME 'gotoFilesystem'
-  DESC 'GOto - Gonicus Terminal Concept, value filesystem.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.7 NAME 'gotoFloppyEnable'
-  DESC 'GOto - Gonicus Terminal Concept, value floppyEnable.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.8 NAME 'gotoCdromEnable'
-  DESC 'GOto - Gonicus Terminal Concept, value cdromEnable.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.9 NAME 'gotoLpdEnable'
-  DESC 'GOto - Gonicus Terminal Concept, value lpdEnable.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.10 NAME 'gotoScannerEnable'
-  DESC 'GOto - Gonicus Terminal Concept, value scannerEnable.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.11 NAME 'gotoScannerClients'
-  DESC 'GOto - Gonicus Terminal Concept, value scannerClients.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.14 NAME 'gotoRootPasswd'
-  DESC 'GOto - Gonicus Terminal Concept, value rootPasswd.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.17 NAME 'gotoXMonitor'
-  DESC 'GOto - Gonicus Terminal Concept, value xMonitor.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.18 NAME 'gotoXHsync'
-  DESC 'GOto - Gonicus Terminal Concept, value xHsync.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.19 NAME 'gotoXVsync'
-  DESC 'GOto - Gonicus Terminal Concept, value xVsync.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.20 NAME 'gotoXResolution'
-  DESC 'GOto - Gonicus Terminal Concept, value xResolution.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.21 NAME 'gotoXColordepth'
-  DESC 'GOto - Gonicus Terminal Concept, value xColordepth.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.22 NAME 'gotoXMouseport'
-  DESC 'GOto - Gonicus Terminal Concept, value xMouseport.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.23 NAME 'gotoXMouseButtons'
-  DESC 'GOto - Gonicus Terminal Concept, value xMouseButtons.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.25 NAME 'gotoXKbModel'
-  DESC 'GOto - Gonicus Terminal Concept, value xKbmodel.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.26 NAME 'gotoXKbLayout'
-  DESC 'GOto - Gonicus Terminal Concept, value xKblayout.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.27 NAME 'gotoXKbVariant'
-  DESC 'GOto - Gonicus Terminal Concept, value xKbvariant.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.28 NAME 'gotoXDriver'
-  DESC 'GOto - Gonicus Terminal Concept, value xDriver.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.29 NAME 'gotoSndModule'
-  DESC 'GOto - Gonicus Terminal Concept, value sound Modules.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.31 NAME 'gotoAutoFs'
-  DESC 'GOto - Gonicus Terminal Concept, value autofs.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.32 NAME 'gotoModules'
-  DESC 'GOto - Gonicus Terminal Concept, value kernel modules.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.33 NAME 'gotoAdaptPath'
-  DESC 'GOto - Gonicus Terminal Concept, value adaptpath.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.34 NAME 'gotoXMouseType'
-  DESC 'Hardware definitions, value Type of mouse'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.39 NAME 'gotoScannerBackend'
-  DESC 'GOto - Gonicus Terminal Concept, value scannerBackend.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.40 NAME 'gotoScannerModel'
-  DESC 'GOto - Gonicus Terminal Concept, value scannerModel.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.1 NAME 'ghCpuType'
-  DESC 'Hardware definitions, value cpuType'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.2 NAME 'ghMemSize'
-  DESC 'Hardware definitions, value memSize'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.3 NAME 'ghUsbSupport'
-  DESC 'Hardware definitions, value usbSupport'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.4 NAME 'ghIdeDev'
-  DESC 'Hardware definitions, value ideDev'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.5 NAME 'ghScsiDev'
-  DESC 'Hardware definitions, value scsiDev'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.7 NAME 'ghSoundAdapter'
-  DESC 'Hardware definitions, value soundAdapter'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.8 NAME 'ghNetNic'
-  DESC 'Hardware definitions, value Network Device'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.9 NAME 'ghGfxAdapter'
-  DESC 'Hardware definitions, value Grafikkarte'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.10 NAME 'ghInventoryNumber'
-  DESC 'Unique number for inclusion in an inventory'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.11 NAME 'gotoSysStatus'
-  DESC 'Keeps current system status - info shown in GOsa'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.2.12 NAME 'gotoHardwareChecksum'
-  DESC 'GOto - quick way to see if something has changed'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.6 NAME 'gotoPrinterPPD'
-  DESC 'GOto - Gonicus Terminal Concept, PPD data'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-  SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.11.10 NAME 'gotoLogonScript'
   DESC 'GOto - specifies a LogonScript'
+  OBSOLETE
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.12 NAME 'gotoUserPrinter'
-  DESC 'GOto - keeps printers shown for this user'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.13 NAME 'gotoUserAdminPrinter'
-  DESC 'GOto - keeps printers we are admin for'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.16 NAME 'gotoGroupPrinter'
-  DESC 'GOto - keeps printers shown for this user'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.11.17 NAME 'gotoGroupAdminPrinter'
-  DESC 'GOto - keeps printers we are admin for'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.38414.6.10.1 NAME 'printerWindowsInfFile'
-  DESC 'Path to windows inf file for this printer'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.38414.6.10.2 NAME 'printerWindowsDriverDir'
-  DESC 'Path to directory that contains windows drivers for this printer'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
-attributetype ( 1.3.6.1.4.1.38414.6.10.3 NAME 'printerWindowsDriverName'
-  DESC 'Windows name of the printer driver'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.13 NAME 'gosaDefaultPrinter'
   DESC 'Defines a default printer a user owns'
+  OBSOLETE
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.11.14 NAME 'gotoHotplugDevice'
   DESC 'GOto - keeps hotplug devices'
+  OBSOLETE
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.11.18 NAME 'gotoHotplugDeviceDN'
   DESC 'GOto - points to hotplug devices'
+  OBSOLETE
   EQUALITY distinguishedNameMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.11.19 NAME 'gotoLogoffScript'
   DESC 'GOto - specifies a LogoffScript'
+  OBSOLETE
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.1.1 NAME 'gotoSyslogServer'
   DESC 'GOto - Gonicus Terminal Concept, value syslogServer.'
+  OBSOLETE
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.1.2 NAME 'gotoNtpServer'
-  DESC 'GOto - Gonicus Terminal Concept, value ntpServer.'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.1.3 NAME 'gotoSwapServer'
   DESC 'GOto - Gonicus Terminal Concept, value swapServer.'
   EQUALITY caseIgnoreIA5Match
@@ -447,6 +69,7 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.1.16 NAME 'gotoXMethod'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.1.24 NAME 'gotoMode'
   DESC 'GOto - Gonicus Terminal Concept, Terminal is active.'
+  OBSOLETE
   EQUALITY caseIgnoreIA5Match
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
@@ -475,6 +98,7 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.1.37 NAME 'gotoTerminalPath'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.1.38 NAME 'gotoLdapServer'
   DESC 'LDAP server to use'
+  OBSOLETE
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -500,6 +124,15 @@ attributetype ( 1.3.6.1.4.1.38414.16.10.3 NAME 'fdMobilePUK'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
   SINGLE-VALUE )
 
+## Systems
+
+attributetype ( 1.3.6.1.4.1.38414.16.10.4 NAME 'fdMode'
+  DESC 'FusionDirectory - "locked" or "unlocked" (other values means unlocked) '
+  EQUALITY caseIgnoreIA5Match
+  SUBSTR caseIgnoreIA5SubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+  SINGLE-VALUE)
+
 ## Printer
 
 attributetype ( 1.3.6.1.4.1.38414.16.15.1 NAME 'fdPrinterWindowsInfFile'
@@ -532,83 +165,74 @@ attributetype ( 1.3.6.1.4.1.38414.16.15.5 NAME 'fdPrinterAdminUsers'
   SUBSTR caseIgnoreIA5SubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
+# Old objectClasses
+
 objectclass (1.3.6.1.4.1.10098.1.2.1.1 NAME 'gotoTerminal'
   DESC 'GOto - Gonicus Terminal Concept, objectclass' SUP top AUXILIARY
+  OBSOLETE
   MUST ( cn )
-  MAY  ( description $ macAddress $ ipHostNumber $ gotoShare))
+  MAY  ( description $ macAddress $ ipHostNumber ))
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.30 NAME 'gotoWorkstation'
   DESC 'GOto - Gonicus Terminal Concept, objectclass' SUP top AUXILIARY
+  OBSOLETE
   MUST ( cn )
-  MAY  ( description $ macAddress $ ipHostNumber $ gotoShare))
+  MAY  ( description $ macAddress $ ipHostNumber ))
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.31 NAME 'gotoPrinter'
   DESC 'GOto - Gonicus Terminal Concept, objectclass' SUP top STRUCTURAL
+  OBSOLETE
   MUST ( cn )
-  MAY ( labeledURI $ description $ l $ gotoPrinterPPD $ macAddress $ ipHostNumber $ gotoUserPrinter $
-        gotoUserAdminPrinter $ gotoGroupPrinter $ gotoGroupAdminPrinter $
-        printerWindowsInfFile $ printerWindowsDriverDir $ printerWindowsDriverName) )
+  MAY ( labeledURI $ description $ l $ macAddress $ ipHostNumber ) )
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.32 NAME 'gotoEnvironment'
   DESC 'GOto - contains environment settings' SUP top AUXILIARY
-  MAY ( gotoProfileServer $ gotoProfileFlags $ gotoXResolution $ gotoShare $ gotoLogonScript $
-        gotoHotplugDevice $ gotoProfileQuota $ gotoHotplugDeviceDN $ gosaDefaultPrinter) )
+  OBSOLETE
+  MAY ( gotoLogonScript $
+        gotoHotplugDevice $ gotoHotplugDeviceDN $ gosaDefaultPrinter) )
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.34 NAME 'gotoWorkstationTemplate'
   DESC 'GOto - Gonicus Terminal Concept, objectclass' SUP top AUXILIARY
+  OBSOLETE
   MUST ( cn )
-  MAY  ( description $ gotoShare $
-         ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $
-         ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $
-         gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $
-         gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $
-         gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $
-         gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $
-         gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $
-         gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $
-         gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $
-         gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $
-         gotoTerminalPath $ gotoLdapServer $ gotoScannerModel ))
+  MAY  ( description $
+         gotoSyslogServer $  gotoSwapServer $
+         gotoXdmcpServer $ gotoXMethod $
+         gotoMode $ macAddress $
+         gotoKernelParameters $ gotoBootKernel $
+         gotoTerminalPath $ gotoLdapServer ))
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.35 NAME 'gotoTerminalTemplate'
   DESC 'GOto - Gonicus Terminal Concept, objectclass' SUP top AUXILIARY
+  OBSOLETE
   MUST ( cn )
-  MAY  ( description $ gotoShare $
-         ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $
-         ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $
-         gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $
-         gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $
-         gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $
-         gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $
-         gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $
-         gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $
-         gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $
-         gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $
-         gotoTerminalPath $ gotoLdapServer $ gotoScannerModel))
+  MAY  ( description $
+         gotoSyslogServer $  gotoSwapServer $
+         gotoXdmcpServer $ gotoXMethod $
+         gotoMode $ macAddress $
+         gotoKernelParameters $ gotoBootKernel $
+         gotoTerminalPath $ gotoLdapServer ))
 
 objectclass (1.3.6.1.4.1.10098.1.2.1.42 NAME 'gotoDevice'
   DESC 'GOto - contains environment settings' SUP top STRUCTURAL
+  OBSOLETE
   MUST ( cn )
   MAY ( gotoHotplugDevice $ description ) )
 
 # objectclass for Hardware definitions
 objectclass (1.3.6.1.4.1.10098.1.2.1.3 NAME 'GOhard'
   DESC 'Gonicus Hardware definitions, objectclass' SUP top STRUCTURAL
+  OBSOLETE
   MUST ( cn )
-  MAY ( ghGfxAdapter $ ghNetNic $ ghSoundAdapter $ ghIdeDev $ ghScsiDev $
-        macAddress $ ghUsbSupport $ ghMemSize $ ghCpuType $ ghInventoryNumber $
-        gotoSyslogServer $ gotoNtpServer $ gotoSwapServer $ gotoLpdServer $
-        gotoFontPath $ gotoFilesystem $ gotoFloppyEnable $ gotoCdromEnable $
-        gotoLpdEnable $ gotoScannerEnable $ gotoScannerClients $
-        gotoRootPasswd $ gotoXdmcpServer $ gotoXMethod $ gotoSndModule $
-        gotoXMonitor $ gotoXHsync $ gotoXVsync $ gotoXResolution $
-        gotoXColordepth $ gotoXMouseport $ gotoXMouseButtons $ gotoMode $ gotoXKbModel $
-        gotoXKbLayout $ gotoXKbVariant $ gotoXDriver $ gotoXMouseType $ macAddress $
-        gotoAutoFs $ gotoModules $ gotoAdaptPath $ gotoKernelParameters $ gotoBootKernel $
-        gotoTerminalPath $ gotoLdapServer $ gotoScannerModel $ ipHostNumber $ l $
-        gotoSysStatus $ description $ gotoHardwareChecksum ) )
-
-# Object Class
+  MAY ( macAddress $
+        gotoSyslogServer $  gotoSwapServer $
+        gotoXdmcpServer $ gotoXMethod $
+        gotoMode $
+        gotoKernelParameters $ gotoBootKernel $
+        gotoTerminalPath $ gotoLdapServer $  ipHostNumber $ l $ description ) )
+
+# Systems Object Classes
+# Systems should also use ipHost and ieee802Device
 
 objectclass ( 1.3.6.1.4.1.38414.16.2.1 NAME 'fdMobilePhone'
   DESC 'FusionDirectory mobile phone class'
@@ -616,6 +240,21 @@ objectclass ( 1.3.6.1.4.1.38414.16.2.1 NAME 'fdMobilePhone'
   MAY ( description $ telephoneNumber $ serialNumber $
         fdMobileIMEI $ fdMobileOS $ fdMobilePUK ) )
 
+objectclass ( 1.3.6.1.4.1.38414.16.2.2 NAME 'fdWorkstation'
+  DESC 'FusionDirectory workstation class'
+  MUST ( cn )
+  MAY  ( fdMode ))
+
+objectclass ( 1.3.6.1.4.1.38414.16.2.3 NAME 'fdServer'
+  DESC 'FusionDirectory server class'
+  MUST ( cn )
+  MAY  ( fdMode ))
+
+objectclass ( 1.3.6.1.4.1.38414.16.2.4 NAME 'fdTerminal'
+  DESC 'FusionDirectory terminal class'
+  MUST ( cn )
+  MAY  ( fdMode ))
+
 objectclass ( 1.3.6.1.4.1.38414.16.2.5 NAME 'fdPrinter'
   DESC 'FusionDirectory printer class'
   MUST ( cn )
@@ -623,11 +262,12 @@ objectclass ( 1.3.6.1.4.1.38414.16.2.5 NAME 'fdPrinter'
   fdPrinterWindowsInfFile $ fdPrinterWindowsDriverDir $ fdPrinterWindowsDriverName $
   fdPrinterUsers $ fdPrinterAdminUsers))
 
+# For component we use standard OC "device"
+
 objectclass ( 1.3.6.1.4.1.38414.16.2.7 NAME 'fdPhone'
-  SUP top AUXILIARY
   DESC 'FusionDirectory phone class'
   MUST ( cn )
-  MAY ( description $ telephoneNumber ) )
+  MAY ( description $ telephoneNumber $ serialNumber ) )
 
 objectclass (1.3.6.1.4.1.38414.16.2.8 NAME 'fdTerminalStartup'
   DESC 'GOto - Gonicus Terminal Concept, objectclass'
diff --git a/systems/locale/ar/fusiondirectory.po b/systems/locale/ar/fusiondirectory.po
index bb603b749889e2e55ed0324d2fd25b0e15115172..bb6751e5eaba162970ea9a3a277ced3452e20582 100644
--- a/systems/locale/ar/fusiondirectory.po
+++ b/systems/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ 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:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Ø£Ù†Ø¸Ù…Ø©"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "Ø®Ø§Ø¯Ù…"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Ø®Ø§Ø¯Ù…"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Ø®Ø§Ø¯Ù…"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Ø§Ù„ÙˆØµÙ"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Ø¥Ø²Ø§Ù„Ø©"
 
@@ -361,151 +258,156 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Ø§Ù„Ø¥Ø³Ù…"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Ø§Ù„Ù‡Ø§ØªÙ"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Ø§Ù„Ø¨Ø¯Ø§ÙŠØ©"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Ø®Ø¯Ù…Ø§Øª"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr "Ø¥Ø®ØªÙŠØ§Ø±"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "ØªØÙƒÙ… Ø§Ù„Ø£Ù†Ø¸Ù…Ø©"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "ØªØÙƒÙ… Ø§Ù„Ø£Ù†Ø¸Ù…Ø©"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Ø·Ø§Ø¨Ø¹Ø©"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1128,107 +997,13 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/ca/fusiondirectory.po b/systems/locale/ca/fusiondirectory.po
index 34faf248275e01837a3f18d1483c1bc898e1ec38..9919ca23e99d437e3bc9fe9fa07aaee4882f983c 100644
--- a/systems/locale/ca/fusiondirectory.po
+++ b/systems/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "Error d'LDAP"
-
-#: 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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TelÃ¨fon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformaciÃ³"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "LocalitzaciÃ³"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "AvÃs"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ¨ric"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/cs_CZ/fusiondirectory.po b/systems/locale/cs_CZ/fusiondirectory.po
index 79b64c64ef53797fa748cbb2bffdce72a6a43d50..d30ba1b7eb2a1a51f3bf675e4eb90dea6f93370b 100644
--- a/systems/locale/cs_CZ/fusiondirectory.po
+++ b/systems/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ 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:319
 msgid "Network"
 msgstr "SÃÅ¥"
 
@@ -34,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
-msgstr "SystÃ©my"
+msgstr "systÃ©my"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr "NÃ¡zev poÄÃtaÄe, urÄenÃ©ho pro pouÅ¾itÃ touto jednotkou"
 
@@ -57,31 +57,31 @@ msgstr "NÃ¡zev poÄÃtaÄe, urÄenÃ©ho pro pouÅ¾itÃ touto jednotkou"
 msgid "Workstations"
 msgstr "PracovnÃ stanice"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
-msgstr "Servery"
+msgstr "servery"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "PracovnÃ stanice s MS Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "TerminÃ¡ly"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "TiskÃ¡rny"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "Telefony"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr "SouÄÃ¡sti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "MobilnÃ telefony"
 
@@ -159,7 +159,7 @@ msgstr "VÄ›tev, ve kterÃ© budou uloÅ¾eny mobilnÃ telefony"
 
 #: config/systems/class_systemsPluginConfig.inc:85
 msgid "Miscellaneous"
-msgstr "RÅ¯znÃ©"
+msgstr "rÅ¯znÃ©"
 
 #: config/systems/class_systemsPluginConfig.inc:89
 msgid "Available encodings for share services"
@@ -175,7 +175,7 @@ msgstr "NÃ¡zev tohoto kÃ³dovÃ¡nÃ znakÅ¯"
 
 #: config/systems/class_systemsPluginConfig.inc:98
 msgid "Label"
-msgstr "Å tÃtek"
+msgstr "jmenovka"
 
 #: config/systems/class_systemsPluginConfig.inc:98
 msgid "The encoding displayed name"
@@ -185,157 +185,54 @@ msgstr "ZobrazovanÃ½ nÃ¡zev tohoto kÃ³dovÃ¡nÃ znakÅ¯"
 msgid "Encodings"
 msgstr "ZnakovÃ© sady"
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Zapnuto"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "UzamÄeno"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr "SluÅ¾ba infrastruktury"
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Chyba udÃ¡losti"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "UdÃ¡lost %s nenÃ dostupnÃ¡!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Vypnout"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Restart"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "OkamÅ¾itÃ¡ aktualizace"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "NaplÃ¡novanÃ¡ aktualizace"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Probudit"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "PÅ™einstalovat"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Test operaÄnÃ pamÄ›ti"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "AnalÃ½za systÃ©mu"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "Chyba LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "SystÃ©m"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "SystÃ©movÃ¡ skupina"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "reÅ¾im"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "nÃ¡vÄ›stÃ akce"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Server pro odklÃ¡dÃ¡nÃ pamÄ›ti"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "server"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
-msgstr "Server"
+msgstr "server"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Informace o serveru"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
-msgstr "Seznam sluÅ¾eb"
+msgstr "seznam sluÅ¾eb"
 
 #: admin/systems/serverService-list.xml:14
 msgid "Service"
-msgstr "SluÅ¾ba"
+msgstr "sluÅ¾by"
 
 #: admin/systems/serverService-list.xml:27
 msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
-msgstr "Popis"
+msgstr "popis"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
-msgstr "Akce"
+msgstr "akce"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
-msgstr "VytvoÅ™it"
+msgstr "vytvoÅ™it"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
-msgstr "Odstranit"
+msgstr "odebrat"
 
 #: admin/systems/serverService-list.xml:89
 msgid "Get status"
@@ -343,193 +240,206 @@ msgstr "Zjistit stav"
 
 #: admin/systems/serverService-list.xml:97
 msgid "Start"
-msgstr "Spustit"
+msgstr "spustit"
 
 #: admin/systems/serverService-list.xml:105
 msgid "Stop"
-msgstr "Zastavit"
+msgstr "zastavit"
 
 #: admin/systems/serverService-list.xml:113
 msgid "Restart"
-msgstr "Restartovat"
+msgstr "restartovat"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
-msgstr "Upravit sluÅ¾bu"
+msgstr "upravit sluÅ¾bu"
 
 #: admin/systems/serverService-list.xml:129
 msgid "Remove service"
-msgstr "Odebrat sluÅ¾bu"
-
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "IP adresa %s"
-
-#: 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 "IP adresa"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "MAC adresa"
-
-#: 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 "NastavenÃ sÃtÄ›"
+msgstr "odebrat sluÅ¾bu"
 
-#: admin/systems/class_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
-msgstr "SouÄÃ¡st"
+msgstr "souÄÃ¡st"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Informace o souÄÃ¡sti"
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
-msgstr "SÃÅ¥ovÃ© zaÅ™ÃzenÃ"
+msgstr "sÃÅ¥ovÃ© zaÅ™ÃzenÃ"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
-msgstr "Vlastnosti"
+msgstr "vlastnosti"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
-msgstr "NÃ¡zev"
+msgstr "nÃ¡zev"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "NÃ¡zev souÄÃ¡sti"
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "StruÄnÃ½ popis souÄÃ¡sti"
 
-#: 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 "MobilnÃ telefon"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "NastavenÃ sÃtÄ›"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP addresa"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "MAC adresa"
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr "mobilnÃ telefon"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Ãšdaje o mobilnÃm telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "NÃ¡zev mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "StruÄnÃ½ popis mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
-msgstr "Telefon"
+msgstr "telefon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "SÃ©riovÃ© ÄÃslo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "SÃ©riovÃ© ÄÃslo mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "IMEI identifikÃ¡tor"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "IMEI identifikÃ¡tor mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "OperaÄnÃ systÃ©m"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "OperaÄnÃ systÃ©m, nainstalovanÃ½ na tomto telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "SIM karta"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "TelefonÃ ÄÃslo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "TelefonÃ ÄÃslo mobilnÃho telefonu"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "KÃ³d PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 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:32
 msgid "Startup"
-msgstr "Po spuÅ¡tÄ›nÃ"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "SpuÅ¡tÄ›nÃ terminÃ¡lu"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Parametry zavÃ¡dÄ›nÃ systÃ©mu"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "KoÅ™enovÃ½ server"
+
 #: 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:57
+msgid "Swap server"
+msgstr "strÃ¡nkovacÃ (swap) server"
+
 #: 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:63
 msgid "Remote desktop"
-msgstr "VzdÃ¡lenÃ¡ plocha"
+msgstr "vzdÃ¡lenÃ½ desktop"
 
 #: admin/systems/class_terminalStartup.inc:67
 msgid "Connect method"
-msgstr "ZpÅ¯sob pÅ™ipojovÃ¡nÃ"
+msgstr "zpÅ¯sob pÅ™ipojovÃ¡nÃ"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
@@ -558,114 +468,123 @@ msgstr "Windows RDP"
 
 #: admin/systems/class_terminalStartup.inc:75
 msgid "Terminal server"
-msgstr "TerminÃ¡lovÃ½ server"
+msgstr "terminÃ¡lovÃ½ server"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "zdÄ›dÄ›nÃ©"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "strÃ¡nkovat (swap) na mÃstnÃ ÃºloÅ¾iÅ¡tÄ›"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
-msgstr "SluÅ¾by"
+msgstr "sluÅ¾by"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 msgid "Server services"
 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:103
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
-msgstr "Chyba"
-
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Chyba filtru"
+msgstr "chyba"
 
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Filtr je neÃºplnÃ½!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
-msgstr "Informace"
+msgstr "informace"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
-msgstr "Stav sluÅ¾by nelze aktualizovat dokud nebude uloÅ¾ena!"
+msgstr "Nemohu aktualizovat stav sluÅ¾by dokud nebude uloÅ¾ena!"
+
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 msgid "Could not get execute action %s on service %s."
 msgstr "Nelze spustit akci %s na sluÅ¾bÄ› %s."
 
-#: 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
-msgstr "PoÄÃtaÄ"
+msgstr "pracovnÃ stanice"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Informace o poÄÃtaÄi"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
-msgstr "PoÄÃtaÄ"
+msgstr "pracovnÃ stanice"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "NÃ¡zev %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "StruÄnÃ½ popis %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
-msgstr "UmÃstÄ›nÃ"
+msgstr "umÃstÄ›nÃ"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "UmÃstÄ›nÃ %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "Uzamknout toto %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Toto zabrÃ¡nÃ %s v tom, aby bylo opÄ›tovnÄ› nainstalovÃ¡no"
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr "Nelze parsovat %s"
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Pro IP adresu %s nebyl nalezen Å¾Ã¡dnÃ½ DHCP server"
+msgid "No DHCP server found for IPs %s"
+msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "Pro zÃ³nu %s nebyl nalezen Å¾Ã¡dnÃ½ DNS server"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "import(ovat)"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr "Server, ze kterÃ©ho chcete importovat hostitele"
 
@@ -673,11 +592,11 @@ msgstr "Server, ze kterÃ©ho chcete importovat hostitele"
 #: admin/systems/services/terminal/class_serviceTerminal.inc:30
 #: admin/systems/services/terminal/class_serviceTerminal.inc:41
 msgid "Terminal service"
-msgstr "TerminÃ¡lovÃ¡ sluÅ¾ba"
+msgstr "terminÃ¡lovÃ¡ sluÅ¾ba"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:44
 msgid "Temporary disable login"
-msgstr "DoÄasnÄ› zakÃ¡zat pÅ™ihlaÅ¡ovÃ¡nÃ"
+msgstr "doÄasnÄ› zakÃ¡zat pÅ™ihlaÅ¡ovÃ¡nÃ"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:45
 msgid "Disables the login on this terminal server"
@@ -685,7 +604,7 @@ msgstr "ZnemoÅ¾nÃ pÅ™ihlaÅ¡ovÃ¡nÃ k tomuto terminÃ¡lovÃ©mu serveru"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:54
 msgid "Supported session types"
-msgstr "PodporovanÃ© typy sezenÃ"
+msgstr "podporovanÃ© typy relacÃ"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:55
 msgid "The session types supported by this terminal server"
@@ -694,11 +613,11 @@ 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
 msgid "Share service"
-msgstr "SluÅ¾ba sdÃlenÃ"
+msgstr "SluÅ¾by sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
-msgstr "SdÃlenÃ"
+msgstr "sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
@@ -714,7 +633,7 @@ msgstr "Popis tohoto sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
-msgstr "Typ"
+msgstr "typ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
@@ -730,7 +649,7 @@ msgstr "Typ kÃ³dovÃ¡nÃ znakÅ¯ v nÃ¡zvech na tomto sdÃlenÃ"
 
 #: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path / Volume"
-msgstr "Popis umÃstÄ›nÃ / Svazek"
+msgstr "Cesta / Svazek"
 
 #: admin/systems/services/shares/class_serviceShare.inc:68
 msgid "Path or volume concerned by this share"
@@ -738,22 +657,21 @@ msgstr "UmÃstÄ›nÃ Äi svazek, souvisejÃcÃ s tÃmto sdÃlenÃm"
 
 #: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
-msgstr "PÅ™edvolba"
+msgstr "volba"
 
 #: 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:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr "Nejprve je tÅ™eba nastavit kÃ³dovÃ¡nÃ znakÅ¯"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
-msgstr "VarovÃ¡nÃ"
+msgstr "varovÃ¡nÃ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "NeplatnÃ¡ hodnota v kÃ³dovÃ¡nÃ znakÅ¯ : %s"
@@ -761,7 +679,7 @@ msgstr "NeplatnÃ¡ hodnota v kÃ³dovÃ¡nÃ znakÅ¯ : %s"
 #: admin/systems/services/ldap/class_serviceLDAP.inc:35
 #: admin/systems/services/ldap/class_serviceLDAP.inc:96
 msgid "LDAP service"
-msgstr "SluÅ¾ba LDAP"
+msgstr "sluÅ¾ba LDAP"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:39
 msgid "LDAP Base"
@@ -773,7 +691,7 @@ msgstr "ZÃ¡klad LDAP, kterÃ½ pouÅ¾Ãt pro tento LDAP server"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "LDAP URI"
-msgstr "URI adresa LDAP"
+msgstr "adresa (URI) LDAPu"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:44
 msgid "The LDAP URI to use in order to contact this LDAP server"
@@ -805,7 +723,8 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:61
 msgid "Specifies how alias dereferencing is done when performing a search"
-msgstr "UrÄuje jak je dÄ›lÃ¡n dereferencing alternativnÃch nÃ¡zvÅ¯ pÅ™i provÃ¡dÄ›nÃ hledÃ¡nÃ"
+msgstr ""
+"UrÄuje jak je dÄ›lÃ¡n dereferencing alternativnÃch nÃ¡zvÅ¯ pÅ™i provÃ¡dÄ›nÃ hledÃ¡nÃ"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
@@ -829,7 +748,7 @@ msgstr "TLS cert. cert. autority "
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
-msgstr "UmÃstÄ›nÃ souboru s TLS certifikÃ¡tem cert. autority"
+msgstr "UmÃstÄ›nÃ souboru s tls certifikÃ¡tem cert. autority"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:78
 msgid "TLS ReqCert"
@@ -839,7 +758,9 @@ msgstr ""
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "UrÄuje co vÅ¡e ovÄ›Å™ovat u pÅ™ÃpadnÃ©ho serverovÃ©ho certifikÃ¡tu v rÃ¡mci TLS sezenÃ"
+msgstr ""
+"UrÄuje co vÅ¡e ovÄ›Å™ovat u pÅ™ÃpadnÃ©ho serverovÃ©ho certifikÃ¡tu v rÃ¡mci TLS "
+"sezenÃ"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -849,7 +770,10 @@ msgstr "TLS â€“ kontrola zneplatnÄ›nÃ"
 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 "UrÄuje, zda kontrolovat, zda nebyla zruÅ¡ena platnost certifikÃ¡tu serveru. KonkrÃ©tnÄ› pomocÃ seznamu odvolanÃ½ch certifikÃ¡tÅ¯ (CRL) danÃ© certifikaÄnÃ autority"
+msgstr ""
+"UrÄuje, zda kontrolovat, zda nebyla zruÅ¡ena platnost certifikÃ¡tu serveru. "
+"KonkrÃ©tnÄ› pomocÃ seznamu odvolanÃ½ch certifikÃ¡tÅ¯ (CRL) danÃ© certifikaÄnÃ "
+"autority"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
@@ -857,150 +781,107 @@ msgstr "LDAP"
 
 #: admin/systems/system-list.xml:10
 msgid "List of systems"
-msgstr "Seznam systÃ©mÅ¯"
-
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "UzamÄenÃ½ server"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "UzamÄenÃ½ poÄÃtaÄ"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "UzamÄenÃ½ terminÃ¡l"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "PracovnÃ stanice s MS Windows"
-
-#: 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 "TerminÃ¡l"
+msgstr "seznam systÃ©mÅ¯"
 
-#: 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 "TiskÃ¡rna"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP adresa"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC adresa"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
-msgstr "VydÃ¡nÃ"
-
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "PoÄÃtaÄ s MS Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "SÃÅ¥ovÃ¡ tiskÃ¡rna"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "MobilnÃ telefon"
+msgstr "vydÃ¡nÃ"
 
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
-msgstr "Spustit akci"
+msgstr "spustit akci"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
-msgstr "NaplÃ¡novat akci"
+msgstr "naplÃ¡novat akci"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "Upravit systÃ©m"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
-msgstr "Odstranit systÃ©m"
+msgstr "odebrat systÃ©m"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Informace o telefonu"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr "JakÃ½ telefonnÃ pÅ™Ãstroj"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "NÃ¡zev telefonu"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "StruÄnÃ½ popis telefonu"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "SÃ©riovÃ© ÄÃslo telefonu"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "TelefonnÃ ÄÃslo telefonu"
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "sprÃ¡va systÃ©mÅ¯"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr "SluÅ¾ba infrastruktury"
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "OprÃ¡vnÄ›nÃ"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
-msgstr "PÅ™evzato z %s"
+msgstr "zdÄ›dÄ›no z %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "SprÃ¡va systÃ©mÅ¯"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "tiskÃ¡rna"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1016,11 +897,11 @@ msgstr ""
 
 #: admin/systems/class_printGeneric.inc:72
 msgid "Details"
-msgstr "Podrobnosti"
+msgstr "podrobnosti"
 
 #: admin/systems/class_printGeneric.inc:75
 msgid "Printer location"
-msgstr "UmÃstÄ›nÃ tiskÃ¡rny"
+msgstr "kde se tiskÃ¡rna nachÃ¡zÃ"
 
 #: admin/systems/class_printGeneric.inc:75
 msgid "The location of the printer"
@@ -1028,7 +909,7 @@ msgstr ""
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "Printer URL"
-msgstr "URL adresa tiskÃ¡rny"
+msgstr "adresa (URL) tiskÃ¡rny"
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "The URL of the printer"
@@ -1044,18 +925,6 @@ msgstr "UÅ¾ivatelÃ©, kteÅ™Ã mohou pouÅ¾Ãvat tuto tiskÃ¡rnu"
 msgid "Users which are allowed to administrate this printer"
 msgstr "uÅ¾ivatelÃ©, kteÅ™Ã smÄ›jÃ spravovat tuto tiskÃ¡rnu"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "MAC adresa"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "Popis umÃstÄ›nÃ v MS Windows"
@@ -1084,14 +953,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Informace o terminÃ¡lu"
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminÃ¡l"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "terminÃ¡l"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr "Informace o terminÃ¡lu"
+
 #: 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)"
@@ -1103,9 +978,9 @@ msgstr "Je zde argonaut server, provozovanÃ½ na %1 (%3://%2:%4)"
 #: 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] "Jen na jedinÃ©m systÃ©mu je nastavenÃ½ argonaut klient."
-msgstr[1] "%1 systÃ©my majÃ nastavenÃ©ho argonaut klienta."
-msgstr[2] "%1 systÃ©mÅ¯ mÃ¡ nastavenÃ©ho argonaut klienta."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: addons/dashboard/systems_stats.tpl.c:11
 msgid "But no system is configured to run an argonaut client!"
@@ -1118,111 +993,20 @@ msgid ""
 msgid_plural ""
 "%1 systems are configured to run an argonaut client, but there is no "
 "argonaut server configured!"
-msgstr[0] "SystÃ©m mÃ¡ nastavenÃ©ho argonaut klienta, ale nenÃ zde nastaven Å¾Ã¡dnÃ½ argonaut server!"
-msgstr[1] "%1 systÃ©my majÃ nastavenÃ©ho argonaut klienta, ale nenÃ zde nastaven Å¾Ã¡dnÃ½ argonaut server!"
-msgstr[2] "%1 systÃ©mÅ¯ mÃ¡ nastavenÃ©ho argonaut klienta, ale nenÃ zde nastaven Å¾Ã¡dnÃ½ argonaut server!"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Akce, kterÃ© zde uÄinÃte ovlivnÃ vÅ¡echny systÃ©my ve skupinÄ›, do kterÃ© tento objekt spadÃ¡. DÃ¡le, vÅ¡echny hodnoty zde upravitelnÃ©, mohou bÃ½t pÅ™evzaty klienty, pÅ™iÅ™azenÃ½mi do stejnÃ© skupiny, jako tento objekt."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "ObecnÃ©"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Vyberte reÅ¾im terminÃ¡lu"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Vyberte, kterÃ½ koÅ™enovÃ½ souborovÃ½ systÃ©m, umÃstÄ›nÃ½ na sÃÅ¥ovÃ©m souborovÃ©m systÃ©mu (NFS), pouÅ¾Ãt"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Vyberte sÃÅ¥ovÃ½ souborovÃ½ systÃ©m (NFS), na kterÃ½ umÃstit soubory pro odklÃ¡dÃ¡nÃ strÃ¡nek pamÄ›ti"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Akce"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Vyberte akci, kterÃ¡ mÃ¡ bÃ½t spuÅ¡tÄ›na na tomto terminÃ¡lu"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Spustit"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
-msgstr "ZÃ¡klad"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Toto se tÃ½kÃ¡ vÅ¡ech dat ÃºÄtu, pravidel pro pÅ™Ãstupy k systÃ©mu, nastavenÃ IMAP a dalÅ¡Ãch nastavenÃ tohoto uÅ¾ivatele. DobÅ™e si rozmyslete, zda to opravdu chcete udÄ›lat, protoÅ¾e pak jiÅ¾ nebude moÅ¾nÃ© vzÃt provedenÃ© zmÄ›ny zpÄ›t."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Tedy â€“ pokud jste si jisti, kliknÄ›te na Smazat. V opaÄnÃ©m pÅ™ÃpadÄ› operaci zruÅ¡te kliknutÃm na ZruÅ¡it."
+msgstr "zÃ¡klad"
 
 #: 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 "VarovÃ¡nÃ : Jakmile importujete svÃ© OPSI stroje do FusionDirectory, budou zde spravovÃ¡ny. TakÅ¾e, kdyÅ¾ je smaÅ¾ete Äi vypnete jejich OPSI panel, budou z OPSI odstranÄ›ny."
-
-#: admin/systems/system-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtr"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Zobrazit servery"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Zobrazit pracovnÃ stanice"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Zobrazit terminÃ¡ly"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Zobrazit sÃÅ¥ovou tiskÃ¡rnu"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Zobrazit telefony"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Zobrazit pracovnÃ stanice s MS Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Zobrazit sÃÅ¥ovÃ¡ zaÅ™ÃzenÃ"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "Zobrazit mobilnÃ telefony"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "IP adresa"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Navrhnout IP adresu"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "MAC adresa"
+msgstr ""
+"VarovÃ¡nÃ : Jakmile importujete svÃ© OPSI stroje do FusionDirectory, budou zde"
+" spravovÃ¡ny. TakÅ¾e, kdyÅ¾ je smaÅ¾ete Äi vypnete jejich OPSI panel, budou z "
+"OPSI odstranÄ›ny."
diff --git a/systems/locale/de/fusiondirectory.po b/systems/locale/de/fusiondirectory.po
index f2bf9610f4647e3fbf57c9c1192b307f8d1bb50c..a918accc3c6cefde36545c749ad19f09489d2cf1 100644
--- a/systems/locale/de/fusiondirectory.po
+++ b/systems/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -34,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Systeme"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr "Computername, der von Einheit genutzt werden soll"
 
@@ -57,31 +57,31 @@ msgstr "Computername, der von Einheit genutzt werden soll"
 msgid "Workstations"
 msgstr "Arbeitsstationen"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Server"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "Windows Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "Terminals"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "Drucker"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "Telefone"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr "Komponenten"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "Mobiltelefone"
 
@@ -185,124 +185,21 @@ msgstr "Der angezeigte Encodingname"
 msgid "Encodings"
 msgstr "Encodings"
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Aktiviert"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Gesperrt"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr "Infrastrukturdienst"
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Ereignisfehler"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "Das Ereignis '%s' ist nicht verfÃ¼gbar!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Ausschalten"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Neustarten"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "Sofortige Aktualisierung"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "Geplante Aktualisierung"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Aufwecken"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Erneut installieren"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Speichertest"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "Systemanalyse"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "LDAP-Fehler"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "System"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Systemgruppe"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Modus"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Ablaufstatus"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Auslagerungsaerver"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "Server"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Serverinformation"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Server"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Liste der Dienste"
@@ -316,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Anlegen"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -361,164 +258,177 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "IP-Adresse %s"
-
-#: 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 "IP-Adresse"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "MAC-Adresse"
-
-#: 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 "Netzwerkeinstellungen"
-
-#: admin/systems/class_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "Komponente"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Komponenteninformation"
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "NetzwerkgerÃ¤t"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Name"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Der Name der Komponente"
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Eine kurze Beschreibung der Komponente"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/system-list.xml:86
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Netzwerkeinstellungen"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP-Adresse"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "MAC-Adresse"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr "MAC-Adresse von diesem System"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "Mobiltelefon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Mobiltelefoninformation"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Der Name des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Eine kurze Beschreibung des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "Die Seriennummer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "IMEI-Nummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "Die IMEI-Nummer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "BS"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "Das Betriebssystem, welches auf diesem Telefon installiert ist"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "SIM-Karte"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "Die Telefonnumer des Mobiltelefons"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "PUK-Nummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 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:32
 msgid "Startup"
-msgstr "Start"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "Terminal-Start"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Startparameter"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Root-Server"
+
 #: 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:57
+msgid "Swap server"
+msgstr "Auslagerungsaerver"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr "Der swap-Server den das Terminal verwenden sollte"
@@ -560,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Terminal-Server"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "geerbt"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Lokaler Auslagerungsspeicher"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 msgid "Server services"
 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:103
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Filterfehler"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Der Filter ist unvollstÃ¤ndig!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Information"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
 msgstr "Kann den Dienststatus nicht aktualisieren bis er gespeichert wurde!"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr "Unbekannte Aktion \"%s\""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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: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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Arbeitsstationinformation"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "Arbeitsstation"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "Der Name der %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "Eine kurze Beschreibung der %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Ort"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "Der Ort des %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "Sperren dieser %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Dies wird verhindern dass %s neu installiert wird"
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr "Konnte %s nicht parsen"
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Kein DHCP-Server fÃ¼r IP %s gefunden"
+msgid "No DHCP server found for IPs %s"
+msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "Kein DNS-Server fÃ¼r Zone %s gefunden"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importieren"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr "Der Server, von dem Sie Hosts importieren wollen"
 
@@ -744,16 +663,15 @@ msgstr "Option"
 msgid "Special option(s) for this share"
 msgstr "Spezielle Option(en) fÃ¼r diese Freigabe"
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr "Sie mÃ¼ssen zuerst die Kodierungen konfigurieren"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Warnung"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "UngÃ¼ltiger Wert in Kodierungen : %s"
@@ -839,7 +757,9 @@ msgstr "TLS ReqCert"
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "Spezifiziert, welche ÃœberprÃ¼fungen an den Serverzertifikaten in einer TLS-Sitzung, wenn vorhanden, gemacht werden sollen"
+msgstr ""
+"Spezifiziert, welche ÃœberprÃ¼fungen an den Serverzertifikaten in einer TLS-"
+"Sitzung, wenn vorhanden, gemacht werden sollen"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -849,7 +769,9 @@ msgstr "TLS CrlCheck"
 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 "Spezifiziert die Certificate Revocation List (CRL) des CA sollte verwendet werden um zu Ã¼berprÃ¼fen ob die Serverzertifikate nicht entzogen worden sind"
+msgstr ""
+"Spezifiziert die Certificate Revocation List (CRL) des CA sollte verwendet "
+"werden um zu Ã¼berprÃ¼fen ob die Serverzertifikate nicht entzogen worden sind"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
@@ -859,148 +781,105 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Liste der Systeme"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Gesperrter Server"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Gesperrte Arbeitsstation"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Gesperrtes Terminal"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
-
-#: 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 "Terminal"
-
-#: 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 "Drucker"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Release"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Netzwerk-Drucker"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Aktion auslÃ¶sen"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Aktion planen"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "System entfernen"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Telefoninformationen"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "Der Name des Telefons"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "Eine kurze Beschreibung des Telefons"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "Die Seriennummer des Telefons"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "Die Telefonnumer des Telefons"
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Systemverwaltung"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr "Aktion abgebrochen"
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr "Infrastrukturdienst"
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Berechtigung"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "Geerbt von %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "Systemverwaltung"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Drucker"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +923,6 @@ msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 msgid "Users which are allowed to administrate this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "MAC-Adresse"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr "MAC-Adresse von diesem System"
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "Windowspfade"
@@ -1084,14 +951,20 @@ msgstr "Treibername"
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Terminalinformation"
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "Terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr "Terminalinformation"
+
 #: 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)"
@@ -1103,8 +976,8 @@ msgstr "Es gibt einen auf %1 (%3://%2:%4) laufenden Argonaut-Server"
 #: 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] "Nur ein System ist zur AusfÃ¼hrung eines Argonaut-Client konfiguriert."
-msgstr[1] "%1 Systeme sind zur AusfÃ¼hrung eines Argonaut-Client konfiguriert."
+msgstr[0] ""
+msgstr[1] ""
 
 #: addons/dashboard/systems_stats.tpl.c:11
 msgid "But no system is configured to run an argonaut client!"
@@ -1117,110 +990,19 @@ msgid ""
 msgid_plural ""
 "%1 systems are configured to run an argonaut client, but there is no "
 "argonaut server configured!"
-msgstr[0] "Ein System ist zur AusfÃ¼hrung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
-msgstr[1] "%1 Systeme sind zur AusfÃ¼hrung eines Argonaut-Client konfiguriert, aber es ist kein Argonaut-Server konfiguriert!"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Aktionen die hier ausgewÃ¤hlt werden beeinflussen alle Systeme dieser Objektgruppe. ZusÃ¤tzlich kÃ¶nnen alle hier einstellbaren Werte von den Systemen ererbt werden."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Allgemein"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "WÃ¤hlen Sie den Terminal-Modus"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "WÃ¤hlen Sie das NFS-Root-Dateisystem"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "WÃ¤hlen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt werden sollen"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Aktion"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "WÃ¤hlen Sie die auszufÃ¼hrende Aktion fÃ¼r dieses Terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "AusfÃ¼hren"
+msgstr[0] ""
+msgstr[1] ""
 
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Dies beinhaltet alle Kontendaten, Systemzugangsregeln, Imap-Einstellungen etc. fÃ¼r diesen Benutzer. Bitte Ã¼berprÃ¼fen Sie nochmals ob Sie dies tun wollen, da es keinen Weg fÃ¼r FusionDirectory gibt Ihre Daten zurÃ¼ck zu bekommen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Wenn Sie sicher sind, drÃ¼cken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
-
 #: 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 "Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI lÃ¶schen, so wird er dadurch nicht wirklich gelÃ¶scht."
-
-#: admin/systems/system-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Zeige Netzwerk-Drucker"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Zeige Telefone"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Zeige Windows Arbeitsstationen"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Zeige Netzwerk-GerÃ¤te"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "Mobiltelefone anzeigen"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "IP-Adresse"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Schlage IP vor"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "MAC-Adresse"
+msgstr ""
+"Warnung: Nachdem Sie die OPSI Hosts nach FusionDirectory importiert haben, "
+"werden diese dort verwaltet. Wenn Sie danach einen direkt in OPSI lÃ¶schen, "
+"so wird er dadurch nicht wirklich gelÃ¶scht."
diff --git a/systems/locale/el_GR/fusiondirectory.po b/systems/locale/el_GR/fusiondirectory.po
index cb4bf53fd4288cb2ac22b05a18500060654962fb..d4ad83637c99fea824e6887c638a9ec6ccc97b25 100644
--- a/systems/locale/el_GR/fusiondirectory.po
+++ b/systems/locale/el_GR/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# pkst <pkst@eellak.gr>, 2015
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
-# pkst <pkst@eellak.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Î”Î¯ÎºÏ„Ï…Î¿"
 
@@ -37,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Systems"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Î£Ï„Î±Ï„Î¹ÏƒÏ„Î¹ÎºÎ¬"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -60,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr "Î£Ï„Î±Î¸Î¼Î¿Î¯ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÏŽÎ½"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "Î£Ï„Î±Î¸Î¼Î¿Î¯ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "Î¤ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¬"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "Î•ÎºÏ„Ï…Ï€Ï‰Ï„ÎÏ‚"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "Î¤Î·Î»ÎÏ†Ï‰Î½Î±"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr "Î£Ï…ÏƒÏ„Î±Ï„Î¹ÎºÎ¬ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î±"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "ÎšÎ¹Î½Î·Ï„Î¬ Ï„Î·Î»ÎÏ†Ï‰Î½Î±"
 
@@ -188,124 +185,21 @@ msgstr "Î— Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î± Ï„Î·Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ Ï€Î¿Ï… Î¸Î± ÎµÎ¼Ï†
 msgid "Encodings"
 msgstr "ÎšÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚"
 
-#: 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_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_terminalStartup.inc:112
-#: admin/systems/class_terminalStartup.inc:123
-msgid "inherited"
-msgstr "ÎºÎ»Î·ÏÎ¿Î½Î¿Î¼Î·Î¼ÎÎ½Î±"
-
-#: admin/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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 "Î¤Î¿  Î³ÎµÎ³Î¿Î½ÏŒÏ‚ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿!"
-
-#: 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:310
-msgid "LDAP error"
-msgstr "Î£Ï†Î¬Î»Î¼Î± LDAP"
-
-#: 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"
-msgstr "Î£Î·Î¼Î±Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Swap"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Î›Î¯ÏƒÏ„Î± Ï…Ï€Î·ÏÎµÏƒÎ¹ÏŽÎ½"
@@ -319,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ±Ï†Î®"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Î•Î½ÎÏÎ³ÎµÎ¹ÎµÏ‚"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Î‘Ï†Î±Î¯ÏÎµÏƒÎ·"
 
@@ -364,164 +258,177 @@ msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚"
 msgid "Remove service"
 msgstr "Î‘Ï†Î±Î¯ÏÎµÏƒÎ· Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP %s"
-
-#: 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 "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· MAC"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "Î£Ï„Î¿Î¹Ï‡ÎµÎ¯Î¿"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿Ï… "
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î¿Ï…"
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Mac "
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "ÎšÎ¹Î½Î·Ï„ÏŒ Ï„Î·Î»ÎÏ†Ï‰Î½Î¿"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Î¤Î·Î»ÎÏ†Ï‰Î½Î¿"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "Î£ÎµÎ¹ÏÎ¹Î±ÎºÏŒÏ‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "ÎŸ ÏƒÎµÎ¹ÏÎ¹Î±ÎºÏŒÏ‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Ï„Î¿Ï… ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "ÎŸ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ IMEI Ï„Î¿Ï… ÎºÎ¹Î½Î·Ï„Î¿Ï Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "OS"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "Î¤Î¿ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¹ÎºÏŒ ÏƒÏÏƒÏ„Î·Î¼Î± Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÎºÎ¹Î½Î·Ï„ÏŒ"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "ÎšÎ¬ÏÏ„Î± SIM"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "Î¤Î·Î»ÎÏ†Ï‰Î½Î¿"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "ÎŸ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ PUK "
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "ÎŸ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ PUK  Ï„Î·Ï‚ sim ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÎºÎ¹Î½Î·Ï„ÏŒ"
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Î•ÎºÎºÎ¯Î½Î·ÏƒÎ·"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Î Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿Î¹ ÎµÎºÎºÎ¯Î½Î·ÏƒÎ·Ï‚"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Root"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr "ÎŸ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ root Ï€Î¿Ï… Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î¿ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŒ"
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Swap"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr "ÎŸ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ swap Ï€Î¿Ï… Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î¿ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŒ"
@@ -563,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Î•Î¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "ÎºÎ»Î·ÏÎ¿Î½Î¿Î¼Î·Î¼ÎÎ½Î±"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Î¤Î¿Ï€Î¹ÎºÏŒ swap"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Î£Ï†Î¬Î»Î¼Î± Ï†Î¯Î»Ï„ÏÎ¿Ï…"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Î¤Î¿ Ï†Î¯Î»Ï„ÏÎ¿ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î¿Î»Î¿ÎºÎ»Î·ÏÏ‰Î¼ÎÎ½Î¿! "
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 msgid "Could not get execute action %s on service %s."
 msgstr "Î”ÎµÎ½ Î®Ï„Î±Î½ Î´Ï…Î½Î±Ï„Î® Î· ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ %s ÏƒÏ„Î·Î½ Ï…Ï€Î·ÏÎµÏƒÎ¯Î± %s."
 
-#: 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Î£Ï„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÏƒÏ„Î±Î¸Î¼Î¿Ï ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "ÏƒÏ„Î±Î¸Î¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï…  %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "ÎœÎ¹Î± ÏƒÏÎ½Ï„Î¿Î¼Î· Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "Î— Ï„Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î± Ï„Î¿Ï… %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "ÎšÎ»ÎµÎ¯Î´Ï‰Î¼Î± Ï„Î¿Ï… %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Î‘Ï…Ï„ÏŒ Î¸Î± Î±Ï€Î¿Ï„ÏÎÏˆÎµÎ¹ Ï„Î¿ %s Î±Ï€ÏŒ Ï„Î¿ Î½Î± ÎµÏ€Î±Î½ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î±Î¸ÎµÎ¯"
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· ÏƒÏ…Î½Ï„Î±ÎºÏ„Î¹ÎºÎ® Î±Î½Î¬Î»Ï…ÏƒÎ· %s"
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Î”Îµ Î²ÏÎÎ¸Î·ÎºÎµ DHCP server Î³Î¹Î± ip %s"
+msgid "No DHCP server found for IPs %s"
+msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "Î”Îµ Î²ÏÎÎ¸Î·ÎºÎµ DNS server Î³Î¹Î± Ï„Î·Î½ Î¶ÏŽÎ½Î· %s"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Î•Î¹ÏƒÎ±Î³Ï‰Î³Î®"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr "Î•Î¯ÏƒÏ„Îµ ÏƒÎ¯Î³Î¿Ï…ÏÎ¿Î¹ ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î± Î±Ï€ÏŒ "
 
@@ -692,7 +608,8 @@ msgstr "Î¥Ï€Î¿ÏƒÏ„Î·ÏÎ¹Î¶ÏŒÎ¼ÎµÎ½Î¿Î¹ Ï„ÏÏ€Î¿Î¹ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚"
 
 #: admin/systems/services/terminal/class_serviceTerminal.inc:55
 msgid "The session types supported by this terminal server"
-msgstr "ÎŸ Ï„ÏÏ€Î¿Î¹ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚ Ï€Î¿Ï… Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
+msgstr ""
+"ÎŸ Ï„ÏÏ€Î¿Î¹ ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚ Ï€Î¿Ï… Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
 
 #: admin/systems/services/shares/class_serviceShare.inc:29
 #: admin/systems/services/shares/class_serviceShare.inc:30
@@ -747,16 +664,15 @@ msgstr "Î•Ï€Î¹Î»Î¿Î³Î®"
 msgid "Special option(s) for this share"
 msgstr "Î•Î¹Î´Î¹ÎºÎ® ÎµÏ€Î¹Î»Î¿Î³Î® (ÎµÏ‚) Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ Î¼Î¿Î¯ÏÎ±ÏƒÎ¼Î±"
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr "Î ÏÎÏ€ÎµÎ¹ Î½Î± ÏÏ…Î¸Î¼Î¯ÏƒÎµÏ„Îµ ÎºÎ¬Ï€Î¿Î¹ÎµÏ‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï€ÏÏŽÏ„Î±"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ· Ï„Î¹Î¼Î® ÏƒÏ„Î¹Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚: %s"
@@ -842,7 +758,9 @@ msgstr "TLS ReqCert"
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï„Î¿Ï…Ï‚ ÎµÎºÏ„ÎµÎ»Î¿ÏÎ¼ÎµÎ½Î¿Ï…Ï‚ ÎµÎ»ÎÎ³Ï‡Î¿Ï…Ï‚ ÏƒÏ„Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¬ Ï„Î¿Ï… ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® ÏƒÎµ Î¼Î¹Î± ÏƒÏÎ½Î¿Î´Î¿ TLS, Î±Î½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹"
+msgstr ""
+"ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï„Î¿Ï…Ï‚ ÎµÎºÏ„ÎµÎ»Î¿ÏÎ¼ÎµÎ½Î¿Ï…Ï‚ ÎµÎ»ÎÎ³Ï‡Î¿Ï…Ï‚ ÏƒÏ„Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¬ Ï„Î¿Ï… ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® ÏƒÎµ "
+"Î¼Î¹Î± ÏƒÏÎ½Î¿Î´Î¿ TLS, Î±Î½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -862,148 +780,105 @@ msgstr "LDAP"
 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 "Winstation"
-
-#: 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "ÎˆÎºÎ´Î¿ÏƒÎ·"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Î•ÎºÏ„Ï…Ï€Ï‰Ï„Î®Ï‚ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "ÎšÎ¹Î½Î·Ï„ÏŒ Ï„Î·Î»ÎÏ†Ï‰Î½Î¿"
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Î•ÎºÎºÎ¯Î½Î·ÏƒÎ· ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Î ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÎ¼ÏŒÏ‚ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Î‘Ï€Î¿Î¼Î¬ÎºÏÏ…Î½ÏƒÎ· ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr "Î¥Î»Î¹ÎºÏŒ Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "ÎœÎ¹Î± ÏƒÏÎ½Ï„Î¿Î¼Î· Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Ï„Î¿Ï… Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "ÎŸ ÏƒÎµÎ¹ÏÎ¹Î±ÎºÏŒÏ‚ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Î³ÏÎ±Î¼Î¼Î®Ï‚ Ï„Î¿Ï… Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï…"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "ÎŸ Î±ÏÎ¹Î¸Î¼ÏŒÏ‚ Ï„Î·Î»ÎµÏ†ÏŽÎ½Î¿Ï… "
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Systems "
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯Î± Ï…Ï€Î¿Î´Î¿Î¼Î®Ï‚"
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Î†Î´ÎµÎ¹Î±"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÏ„Îµ ÎÎ½Î± ÏƒÏ„Î¹Î³Î¼Î¹ÏŒÏ„Ï…Ï€Î¿ Î³Î¹Î±  %s."
-
-#: admin/systems/class_systemManagement.inc:483
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± ÎµÏ€Î±Î½Î±Ï†ÎÏÎµÏ„Îµ ÎÎ½Î± ÏƒÏ„Î¹Î³Î¼Î¹ÏŒÏ„Ï…Ï€Î¿ Î³Î¹Î±  %s."
-
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "ÎšÎ»Î·ÏÎ¿Î½Î¿Î¼Î®Î¸Î·ÎºÎµ Î±Ï€ÏŒ %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Systems "
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Î•ÎºÏ„Ï…Ï€Ï‰Ï„Î®Ï‚"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1047,18 +922,6 @@ msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚ Ï€Î¿Ï… ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î¿
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· Mac "
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "Î”Î¹Î±Î´ÏÎ¿Î¼ÎÏ‚ Windows"
@@ -1087,17 +950,24 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŒ"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Î¤ÎµÏÎ¼Î±Ï„Î¹ÎºÏŒ"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
-msgstr "Î¥Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î±ÏÎºÎµÏ„Î¿Î¯ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ argonaut! (Î±Ï…Ï„ÏŒÏ‚ Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±ÎºÏŒÎ¼Î·)"
+msgstr ""
+"Î¥Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î±ÏÎºÎµÏ„Î¿Î¯ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ argonaut! (Î±Ï…Ï„ÏŒÏ‚ Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±ÎºÏŒÎ¼Î·)"
 
 #: addons/dashboard/systems_stats.tpl.c:5
 msgid "There is an argonaut server running on %1 (%3://%2:%4)"
@@ -1123,107 +993,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Î“ÎµÎ½Î¹ÎºÏŒ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„ÎµÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÎ¿Ï"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ ÎÎ½Î± ÏƒÏÏƒÏ„Î·Î¼Î± Î±ÏÏ‡ÎµÎ¯Ï‰Î½ NFS root Î³Î¹Î± Ï‡ÏÎ®ÏƒÎ·"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Î•Î½ÎÏÎ³ÎµÎ¹Î±"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î¼Î¹Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î³Î¹Î± ÎµÎºÏ„ÎÎ»ÎµÏƒÎ· Î³Î¹Î± Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŒ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ·"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Î’Î¬ÏƒÎ·"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Î¤Î¿ Ï€Î±ÏÏŒÎ½ Ï€ÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ ÏŒÎ»Î± Ï„Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï, Ï„Î¿Ï…Ï‚ ÎºÎ±Î½ÏŒÎ½ÎµÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚, Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ imap ÎºÏ„Î». Î³Î¹Î± Ï„Î¿Î½ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿ Ï‡ÏÎ®ÏƒÏ„Î·. Î Î±ÏÎ±ÎºÎ±Î»ÎµÎ¯ÏƒÏ„Îµ Î½Î± ÎµÎ»ÎÎ³Î¾ÎµÏ„Îµ Î±Î½ ÏŒÎ½Ï„Ï‰Ï‚ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Ï€ÏÎ¿Ï‡Ï‰ÏÎ®ÏƒÎµÏ„Îµ, Î´ÎµÎ´Î¿Î¼ÎÎ½Î¿Ï… ÏŒÏ„Î¹ Ï„Î¿ FusionDirectory Î´ÎµÎ½ Î¸Î± Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î½Î±ÎºÏ„Î®ÏƒÎµÎ¹ Ï€Î»ÎÎ¿Î½ Ï„Î± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÏƒÎ±Ï‚."
-
-#: admin/systems/remove.tpl.c:8
-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 "Î ÏÎ¿ÏƒÎ¿Ï‡Î®: ÎœÎµÏ„Î¬ Ï„Î·Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½ OPSI ÏƒÏ„Î¿ FusionDirectory, Î±Ï…Ï„Î¿Î¯ Î¸Î± ÎµÎ»ÎÎ³Ï‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ (FD). Î£Ï…Î½ÎµÏ€ÏŽÏ‚, Î±Î½ Ï„Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î® Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î·Î½ OPSI ÎºÎ±ÏÏ„ÎÎ»Î± Ï„Î¿Ï…Ï‚, Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½ Î±Ï€ÏŒ Ï„Î¿ OPSI"
-
-#: admin/systems/system-filter.tpl.c:2
-msgid "Filter"
-msgstr "Î¦Î¯Î»Ï„ÏÎ¿"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÏŽÎ½"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ„Î±Î¸Î¼ÏŽÎ½ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® Ï„ÎµÏÎ¼Î±Ï„Î¹ÎºÏŽÎ½"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÎµÎºÏ„Ï…Ï€Ï‰Ï„ÏŽÎ½ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® Ï„Î·Î»ÎµÏ†ÏŽÎ½Ï‰Î½"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ„Î±Î¸Î¼ÏŽÎ½ ÎµÏÎ³Î±ÏƒÎ¯Î±Ï‚ windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ…ÏƒÎºÎµÏ…ÏŽÎ½ Î´Î¹ÎºÏ„ÏÎ¿Ï…"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÎºÎ¹Î½Î·Ï„ÏŽÎ½ Ï„Î·Î»ÎµÏ†ÏŽÎ½Ï‰Î½"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Î ÏÏŒÏ„Î±ÏƒÎ· Î³Î¹Î± ip"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· MAC"
+msgstr ""
+"Î ÏÎ¿ÏƒÎ¿Ï‡Î®: ÎœÎµÏ„Î¬ Ï„Î·Î½ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½ OPSI ÏƒÏ„Î¿ FusionDirectory, Î±Ï…Ï„Î¿Î¯ "
+"Î¸Î± ÎµÎ»ÎÎ³Ï‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ (FD). Î£Ï…Î½ÎµÏ€ÏŽÏ‚, Î±Î½ Ï„Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ Î® Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ "
+"Ï„Î·Î½ OPSI ÎºÎ±ÏÏ„ÎÎ»Î± Ï„Î¿Ï…Ï‚, Î¸Î± Î´Î¹Î±Î³ÏÎ±Ï†Î¿ÏÎ½ Î±Ï€ÏŒ Ï„Î¿ OPSI"
diff --git a/systems/locale/en/fusiondirectory.po b/systems/locale/en/fusiondirectory.po
index 14222f6ccf7e653f6b45c2cd48f2807d49f70329..c9cfa445be86781c72bfac3386f7f01534505428 100644
--- a/systems/locale/en/fusiondirectory.po
+++ b/systems/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -19,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -35,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -58,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -186,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:170
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -317,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -362,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -516,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -561,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:215
+#: admin/systems/class_serverService.inc:285
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:279
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:279
 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
+#: admin/systems/class_serverService.inc:285
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:306
+#: admin/systems/class_serverService.inc:316
+#: admin/systems/class_serverService.inc:327
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:118
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:132
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:166
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:170
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -745,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -860,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1045,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1085,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1121,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/es/fusiondirectory.po b/systems/locale/es/fusiondirectory.po
index 430631e5a1a725703a12fd203ebfcd06ad95dac9..d76db8092ae2ee377998c8572e77389a2e155320 100644
--- a/systems/locale/es/fusiondirectory.po
+++ b/systems/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Servidores"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Activado"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Bloqueado"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Evento de error"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "Â¡El evento '%s' no estÃ¡ disponible!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Apagar"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "ActualizaciÃ³n instantÃ¡nea"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "ActualizaciÃ³n programada"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Despertar"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Reinstalar"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Chequeo de memoria"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "AnÃ¡lisis del sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "Sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Grupos de sistemas"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Modo"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Marca de acciÃ³n"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "Servidor"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Lista de servicios"
@@ -316,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -361,164 +258,177 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "DirecciÃ³n IP %s"
-
-#: 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 "DirecciÃ³n IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "DirecciÃ³n MAC"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "componente"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "Dispositivo de Red"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "DirecciÃ³n IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "TelÃ©fono mÃ³vil"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Inicio"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "Inicio de terminal"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Servidor RaÃz"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,122 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Servidor de terminal"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "heredado"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Memoria de intercambio local"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Error del filtro"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Â¡El filtro estÃ¡ incompleto!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformaciÃ³n"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
-msgstr "Â¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
+msgstr ""
+"Â¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "EstaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "estaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "LocalizaciÃ³n"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importar"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +664,15 @@ msgstr "OpciÃ³n"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +778,105 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "EstaciÃ³n de trabajo bloqueada"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
-
-#: 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 "Terminal"
-
-#: 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 "Impresora"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "AcciÃ³n disparada"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "AcciÃ³n programada"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Eliminar sistema"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "Heredado de %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impresora"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +920,6 @@ msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 msgid "Users which are allowed to administrate this printer"
 msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +948,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1120,107 +990,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Las acciones aquÃ seleccionadas tendrÃ¡n influencia en todos los sistemas en este grupo de objetos. AdemÃ¡s, todos los valores aquÃ editados pueden ser heredados por los clientes asignados a este grupo de objetos."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raÃz 'NFS' que se usarÃ¡"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Seleccione sistema de archivos 'NFS' donde estarÃ¡n los archivos de intercambio"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "AcciÃ³n"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acciÃ³n que se ejecutara en este terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Ejecute"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, las reglas de acceso de sistema, opciones de imap, etc. Para este usuario. Por favor verifique bien si quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
 #: 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 "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostrar la impresoras de red"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Mostrar telÃ©fonos"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
diff --git a/systems/locale/es_CO/fusiondirectory.po b/systems/locale/es_CO/fusiondirectory.po
index c39f8703d42fd9600e388c2a7f04686fc9c40964..a0cc0f9975edbfdd7b571e3958e8660c54c8a31d 100644
--- a/systems/locale/es_CO/fusiondirectory.po
+++ b/systems/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "EstadÃsticas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "Error LDAP"
-
-#: 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 "Modo"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Borrar"
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Error al filtrar"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Â¡El filtro estÃ¡ incompleto!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformaciÃ³n"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "UbicaciÃ³n"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "PrecacuiÃ³n"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Si estÃ¡ seguro presione 'Eliminar' para continuar o 'Cancelar' para abortar."
-
 #: 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 "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/es_VE/fusiondirectory.po b/systems/locale/es_VE/fusiondirectory.po
index d5769fa1788432b155baf112e94a41227a9b76d1..e6db663a468273cf1aa11858952bc0aa52160276 100644
--- a/systems/locale/es_VE/fusiondirectory.po
+++ b/systems/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Servidor"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Activado"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Bloqueado"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Evento de error"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "Â¡El evento '%s' no estÃ¡ disponible!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Apagar"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "ActualizaciÃ³n instantÃ¡nea"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "ActualizaciÃ³n programada"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Despertar"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Reinstalar"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Chequeo de memoria"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "AnÃ¡lisis del sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "Error de LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "Sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Grupos de sistemas"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Modo"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Marca de acciÃ³n"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "Servidor"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Lista de servicios"
@@ -316,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "DescripciÃ³n"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -361,164 +258,177 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "DirecciÃ³n IP %s"
-
-#: 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 "DirecciÃ³n IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "DirecciÃ³n MAC"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "componente"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "Dispositivo de Red"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Propiedades"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "DirecciÃ³n IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Inicio"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "Inicio de terminal"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Servidor RaÃz"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,122 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Servidor de terminal"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "heredado"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Memoria de intercambio local"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Error del filtro"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Â¡El filtro estÃ¡ incompleto!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformaciÃ³n"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
-msgstr "Â¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
+msgstr ""
+"Â¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "EstaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "estaciÃ³n de trabajo"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "LocalizaciÃ³n"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importar"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +664,15 @@ msgstr "OpciÃ³n"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Aviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +778,105 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "EstaciÃ³n de trabajo bloqueada"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "EstaciÃ³n de trabajo Windows"
-
-#: 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 "Terminal"
-
-#: 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 "Impresora"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "VersiÃ³n"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "AcciÃ³n disparada"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "AcciÃ³n programada"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Eliminar sistema"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "AdministraciÃ³n de Sistemas"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Permisos"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "Heredado de %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "AdministraciÃ³n de Sistemas"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impresora"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +920,6 @@ msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 msgid "Users which are allowed to administrate this printer"
 msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +948,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1120,107 +990,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Las acciones aquÃ seleccionadas tendrÃ¡n influencia en todos los sistemas en este grupo de objetos. AdemÃ¡s, todos los valores aquÃ editados pueden ser heredados por los clientes asignados a este grupo de objetos."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "GenÃ©rico"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raÃz 'NFS' que se usarÃ¡"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Seleccione sistema de archivos 'NFS' donde estarÃ¡n los archivos de intercambio"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "AcciÃ³n"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acciÃ³n que se ejecutara en este terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Ejecute"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Esto incluye toda la data de la cuenta, reglas de acceso de sistema, opciones imap, etc. para este usuario. Por favor verifique que realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data"
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
-
 #: 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 "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostrar la impresoras de red"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Mostrar telÃ©fonos"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "DirecciÃ³n IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Proponer ip"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "DirecciÃ³n MAC"
diff --git a/systems/locale/fa_IR/fusiondirectory.po b/systems/locale/fa_IR/fusiondirectory.po
index 0ee1ac1c2774a617c35318b7342f207b36363ef2..73256865f03a01369ed8f81904a616bbf5dfc5f5 100644
--- a/systems/locale/fa_IR/fusiondirectory.po
+++ b/systems/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "Ø®Ø·Ø§ÛŒ LDAP"
-
-#: 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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "ØªÙ„ÙÙ†"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Ø¬ÙˆØ§Ø²"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1118,107 +987,13 @@ msgid_plural ""
 "argonaut server configured!"
 msgstr[0] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/fi_FI/fusiondirectory.po b/systems/locale/fi_FI/fusiondirectory.po
index a76db6bc3131c4ced2b0be695c57b2f19fa30b95..a1e8f2ee3ef53d37135801bdbad98257dec9a0c5 100644
--- a/systems/locale/fi_FI/fusiondirectory.po
+++ b/systems/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "LDAP virhe"
-
-#: 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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Kuvaus"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Luo"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Poista"
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nimi"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Puhelin"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Palvelut"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Virhe"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Varoitus"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Lupa"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Toiminto"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Suorita"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/fr/fusiondirectory.po b/systems/locale/fr/fusiondirectory.po
index b003be35da6aa6ca81d55fec5faa0aef0474b88b..f15650251a99c05e5973f4036fc3c8f38d1affa0 100644
--- a/systems/locale/fr/fusiondirectory.po
+++ b/systems/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016-2017
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 20:13+0000\n"
-"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
-"Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "RÃ©seau"
 
@@ -36,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "SystÃ¨mes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr "Statistiques et informations sur les systÃ¨mes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr "Nom d'ordinateur Ã  utiliser par unitÃ©"
 
@@ -59,31 +57,31 @@ msgstr "Nom d'ordinateur Ã  utiliser par unitÃ©"
 msgid "Workstations"
 msgstr "Stations de travail"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Serveurs"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "Stations de travail Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "Imprimantes"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "TÃ©lÃ©phones"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr "Composants"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "TÃ©lÃ©phones portables"
 
@@ -187,124 +185,21 @@ msgstr "Nom affichÃ© de l'encodage"
 msgid "Encodings"
 msgstr "Encodages"
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "ActivÃ©"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "VerrouillÃ©"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr "Service dâ€™infrastructure"
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Erreur d'Ã©vÃ©nement"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "L'Ã©vÃ©nement '%s' n'est pas disponibleâ€¯!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Ã‰teindre"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "RedÃ©marrer"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "Mise Ã  jour immÃ©diate"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "Mise Ã  jour programmÃ©e"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "RÃ©veiller"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "RÃ©installer"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Test mÃ©moire"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "Analyse du systÃ¨me"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "Erreur LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "SystÃ¨me"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Groupe systÃ¨me"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Mode"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Indicateur d'action"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Serveur de swap"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "serveur"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Serveur"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Information du serveur"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "serveur"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Liste des services"
@@ -318,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Actions"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "CrÃ©er"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -363,145 +258,150 @@ msgstr "Ã‰diter le service"
 msgid "Remove service"
 msgstr "Supprimer le service"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "Adresse IP %s"
-
-#: 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 "Adresse IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "Adresse MAC"
-
-#: 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 "ParamÃ¨tres rÃ©seaux"
-
-#: admin/systems/class_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "Composant"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Information du composant"
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "PÃ©riphÃ©rique rÃ©seau"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "PropriÃ©tÃ©s"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Nom du composant"
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Description courte du composant"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/system-list.xml:86
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "ParamÃ¨tres rÃ©seaux"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Adresse IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr "L'adresse ip de cet imprimante"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Adresse Mac"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr "Adresse Mac de ce systÃ¨me"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "TÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Information du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Nom du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Courte description du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "NumÃ©ro de sÃ©rie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "NumÃ©ro de sÃ©rie du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "NumÃ©ro IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "NumÃ©ro IMEI du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "SystÃ¨me d'exploitation"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "SystÃ¨me d'exploitation installÃ© sur ce tÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "Carte SIM"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "NumÃ©ro de tÃ©lÃ©phone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "NumÃ©ro du tÃ©lÃ©phone portable"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "NumÃ©ro PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "NumÃ©ro PUK de la carte SIM du tÃ©lÃ©phone portable"
 
@@ -517,10 +417,18 @@ msgstr "DÃ©marrage du terminal"
 msgid "Startup parameters"
 msgstr "ParamÃ¨tres de dÃ©marrage"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Serveur racine"
+
 #: 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 "Swap server"
+msgstr "Serveur de swap"
+
 #: 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"
@@ -562,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Serveur de terminaux"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "hÃ©ritÃ©"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Swap local"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
-msgstr "Services"
+msgstr "Service"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 msgid "Server services"
 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:103
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Erreur de filtre"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Le filtre est incomplet !"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Information"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
 msgstr "Impossible de mettre Ã  jour le statut avant que cela soit sauvÃ© !"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr "Action inconnue \"%s\""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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: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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Information de la station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "station de travail"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "Le nom de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "Une courte description de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Lieu"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "L'emplacement de ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "Verrouiller ce %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Ceci empÃªchera ce %s d'Ãªtre rÃ©installÃ©"
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr "Ce systÃ¨me utilise les adresses IP (v4 ou v6)"
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr "Impossible de lire le contenu de %s"
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr "Pas de serveur DHCP trouvÃ© pour l'IP %s"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "Pas de serveur DNS trouvÃ© pour la zone %s"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importer"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr "Le serveur duquel vous souhaitez importer des machines"
 
@@ -746,16 +663,15 @@ msgstr "Option"
 msgid "Special option(s) for this share"
 msgstr "Option(s) spÃ©ciale(s) pour ce partage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr "Vous devez configurer en premier l'encodage"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Avertissement"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valeur d'encodage invalideâ€¯: %s"
@@ -807,7 +723,9 @@ msgstr "Deref"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:61
 msgid "Specifies how alias dereferencing is done when performing a search"
-msgstr "SpÃ©cifie comment le dÃ©-rÃ©fÃ©rencement dâ€™alias est fait lors de lâ€™exÃ©cution d'une recherche"
+msgstr ""
+"SpÃ©cifie comment le dÃ©-rÃ©fÃ©rencement dâ€™alias est fait lors de lâ€™exÃ©cution "
+"d'une recherche"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
@@ -831,7 +749,8 @@ msgstr "AutoritÃ© de certification TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:74
 msgid "Filepath to tls ca certificate"
-msgstr "Chemin vers le fichier du certificat de l'autoritÃ© de certification TLS"
+msgstr ""
+"Chemin vers le fichier du certificat de l'autoritÃ© de certification TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:78
 msgid "TLS ReqCert"
@@ -841,7 +760,9 @@ msgstr "RequÃªte de certificats TLS"
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "Indique quels sont les vÃ©rifications Ã  faire sur les certificats serveurs en cas d'utilisation de session TLS"
+msgstr ""
+"Indique quels sont les vÃ©rifications Ã  faire sur les certificats serveurs en"
+" cas d'utilisation de session TLS"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -851,7 +772,10 @@ msgstr "VÃ©rification de rÃ©vocation TLS"
 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 "Indique si la liste de certificats rÃ©voquÃ©s (CRL) de l'autoritÃ© de certification doit Ãªtre utilisÃ©e pour vÃ©rifier si le certificat a Ã©tÃ© rÃ©voquÃ© ou non"
+msgstr ""
+"Indique si la liste de certificats rÃ©voquÃ©s (CRL) de l'autoritÃ© de "
+"certification doit Ãªtre utilisÃ©e pour vÃ©rifier si le certificat a Ã©tÃ© "
+"rÃ©voquÃ© ou non"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
@@ -861,148 +785,106 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Liste des systÃ¨mes"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Serveur verrouillÃ©"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Station de travail verrouillÃ©e"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminal verrouillÃ©"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "PC Windows"
-
-#: 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 "Terminal"
-
-#: 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 "Imprimante"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Version"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Imprimante rÃ©seau"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "TÃ©lÃ©phone portable"
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "DÃ©clencher une action"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Programmer une action"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr "CrÃ©er un nouvel objet depuis un modÃ¨le"
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "Ã‰diter le systÃ¨me"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Supprimer le systÃ¨me"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Information sur le tÃ©lÃ©phone"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr "MatÃ©riel tÃ©lÃ©phonique"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "Nom du tÃ©lÃ©phone"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "Courte description du tÃ©lÃ©phone"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "NumÃ©ro de sÃ©rie du tÃ©lÃ©phone"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "NumÃ©ro de tÃ©lÃ©phone"
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Gestion des systÃ¨mes"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr "Action annulÃ©e"
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, 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"
+msgstr ""
+"SystÃ¨me %s n'a pas d'adresse mac dÃ©finie, ne peut pas dÃ©clencher l'action"
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr "SystÃ¨me %s est actuellement en cours d'installation"
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr "Service dâ€™infrastructure"
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr "Action dÃ©clenchÃ©e"
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr "Action appelÃ©e sans erreur (rÃ©sultat \"%s\")"
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Permission"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "HÃ©ritÃ© de %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "Gestion des systÃ¨mes"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Imprimante"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1046,18 +928,6 @@ msgstr "Utilisateurs qui sont autorisÃ©s Ã  utiliser cette imprimante"
 msgid "Users which are allowed to administrate this printer"
 msgstr "Utilisateurs qui sont autorisÃ©s Ã  administrer cette imprimante"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr "L'adresse ip de cet imprimante"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Adresse mac"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr "L'adresse mac de cette imprimante"
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "RÃ©pertoires Windows"
@@ -1076,7 +946,9 @@ msgstr "RÃ©pertoire du pilote d'imprimante"
 
 #: admin/systems/class_printGeneric.inc:127
 msgid "Path to directory that contains windows drivers for this printer"
-msgstr "Le chemin vers le rÃ©pertoire qui contient les drivers inf pour cette imprimante"
+msgstr ""
+"Le chemin vers le rÃ©pertoire qui contient les drivers inf pour cette "
+"imprimante"
 
 #: admin/systems/class_printGeneric.inc:131
 msgid "Driver name"
@@ -1086,14 +958,20 @@ msgstr "Nom du driver d'imprimante"
 msgid "Windows name of the printer driver"
 msgstr "Nom windows de ce pilote d'imprimante"
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Information du terminal"
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr "Information du terminal"
+
 #: 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Ã©)"
@@ -1105,7 +983,7 @@ msgstr "Il y a un serveur Argonaut en fonctionnement sur %1 (%3://%2:%4)"
 #: 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] "Un systÃ¨me est configurÃ© pour exÃ©cuter un client Argonaut."
+msgstr[0] "Seul un systÃ¨me est configure pour exÃ©cuter un client Argonaut"
 msgstr[1] "%1 systÃ¨mes sont configurÃ©s pour exÃ©cuter un client Argonaut."
 
 #: addons/dashboard/systems_stats.tpl.c:11
@@ -1119,110 +997,23 @@ msgid ""
 msgid_plural ""
 "%1 systems are configured to run an argonaut client, but there is no "
 "argonaut server configured!"
-msgstr[0] "Un systÃ¨me est configurÃ© pour exÃ©cuter un client Argonaut, mais il nâ€™y a pas de serveur Argonaut configurÃ©â€¯!"
-msgstr[1] "%1 systÃ¨mes sont configurÃ©s pour exÃ©cuter un client Argonaut, mais il nâ€™y a pas de serveur Argonaut configurÃ©â€¯!"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Les actions que vous choisissez ici influencent tous les systÃ¨mes dans ce groupe d'objet. De plus toutes les valeurs Ã©ditables ici peuvent Ãªtre hÃ©ritÃ©es par les clients assignÃ©s Ã  ce groupe d'objets."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Application"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "SÃ©lectionnez le mode du terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "SÃ©lectionnez le systÃ¨me de fichier racine NFS Ã  utiliser"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "SÃ©lectionnez le systÃ¨me de fichier NFS oÃ¹ sera placÃ© le swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Action"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "SÃ©lectionnez l'action Ã  exÃ©cuter sur le terminal"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "ExÃ©cuter"
+msgstr[0] ""
+"Un systÃ¨me est configurÃ© pour exÃ©cuter un client Argonaut, mais il nâ€™y a pas"
+" de serveur Argonaut configurÃ©â€¯!"
+msgstr[1] ""
+"%1 systÃ¨mes sont configurÃ©s pour exÃ©cuter un client Argonaut, mais il nâ€™y a "
+"pas de serveur Argonaut configurÃ©â€¯!"
 
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Cela inclut toutes les donnÃ©es des comptes, les droits d'accÃ¨s, la configuration imap, etc. pour cet utilisateur. Veuillez vous assurer que vous voulez effectuer cette opÃ©ration Ã©tant donnÃ© qu'il sera impossible pour FusionDirectory de rÃ©cupÃ©rer vos donnÃ©es."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Donc - si vous Ãªtes sÃ»r - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
-
 #: 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 "Attentionâ€¯: Une fois que vous importez vos hÃ´tes OPSI dans FusionDirectory, elles seront gÃ©rÃ©es par lui, donc si vous les supprimez ou dÃ©sactivez leur onglet OPSI, elle seront retirÃ©es de OPSI."
-
-#: admin/systems/system-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtre"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Afficher les serveurs"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Afficher les imprimantes rÃ©seaux"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Afficher les tÃ©lÃ©phones"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Afficher les stations Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Afficher les pÃ©riphÃ©riques rÃ©seau"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "Afficher les tÃ©lÃ©phones portables"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "Adresse IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Proposer une adresse ip"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "Adresse MAC"
+msgstr ""
+"Attention: Une fois que vous importez vos hÃ´tes OPSI dans FusionDirectory, "
+"ils seront gÃ©rÃ©s par lui, donc si vous les supprimez ou dÃ©sactivez leur "
+"onglet OPSI, ils seront retirÃ©s de OPSI."
diff --git a/systems/locale/hu_HU/fusiondirectory.po b/systems/locale/hu_HU/fusiondirectory.po
index 5b0bee444c4bd879a2d32acd3db4f04623d3a0b0..179ca31949769b60198a70fb6052b8e5128847b3 100644
--- a/systems/locale/hu_HU/fusiondirectory.po
+++ b/systems/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "LeÃrÃ¡s"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "NÃ©v"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/id/fusiondirectory.po b/systems/locale/id/fusiondirectory.po
index 328895a36970c4b279d1258a5c03763063ca1e05..13e3456b3c0ffe64e2973332a33d0aa12b1844d1 100644
--- a/systems/locale/id/fusiondirectory.po
+++ b/systems/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +33,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +56,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +184,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +212,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +257,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +416,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +469,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +662,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +776,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +918,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +946,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1118,107 +986,13 @@ msgid_plural ""
 "argonaut server configured!"
 msgstr[0] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/it_IT/fusiondirectory.po b/systems/locale/it_IT/fusiondirectory.po
index 68a2570539dc9671a754eec789ede2945740ea1c..5dfd945fab2d1441bbe349f1cb5053fc46568204 100644
--- a/systems/locale/it_IT/fusiondirectory.po
+++ b/systems/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016-2017
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-30 14:33+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr "Rete"
 
@@ -36,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Sistemi"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr "Statistiche e informazioni sui sistemi"
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr "Nome del computer da usare per unitÃ "
 
@@ -59,31 +57,31 @@ msgstr "Nome del computer da usare per unitÃ "
 msgid "Workstations"
 msgstr "Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Servers"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "Workstations Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "Terminali"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "Stampanti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "Telefoni"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr "Componenti"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "Telefono cellulare"
 
@@ -187,124 +185,21 @@ msgstr "Il nome visualizzato per la codifica"
 msgid "Encodings"
 msgstr "Codifiche"
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Attivato"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Bloccato"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr "Servizio d'infrastruttura"
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Errore nell'evento"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "L'evento '%s' non Ã¨ disponibile!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Spegni"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Riavvia"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "Aggiornamento istantaneo"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "Aggiornamento pianificato"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Sveglia"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Installa di nuovo"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Test della memoria"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "Analisi del sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "Errore LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "Sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Gruppo di sistema"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "ModalitÃ "
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Indicatore d'azione"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Server di swap"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "server"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Informazioni server"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr "Elenco dei servizi"
@@ -318,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Azioni"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Crea"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Elimina"
 
@@ -363,145 +258,150 @@ msgstr "Modifica i servizi"
 msgid "Remove service"
 msgstr "Elimina il servizio"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "Indirizzo IP %s"
-
-#: 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 "Indirizzo IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "Indirizzo MAC"
-
-#: 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 "Impostazioni di rete"
-
-#: admin/systems/class_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "Componente"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr "Informazioni sul componente"
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "Periferica di rete"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "ProprietÃ "
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr "Il nome del componente"
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 msgid "A short description of the component"
 msgstr "Una breve descrizione del componente"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:36
-#: admin/systems/class_mobilePhoneGeneric.inc:41
-#: admin/systems/class_mobilePhoneGeneric.inc:42
-#: admin/systems/system-list.xml:86
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Impostazioni di rete"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "Indirizzo IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr "Indirizzo IP utilizzato dal sistema"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Indirizzo MAC"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr "Indirizzo MAC di questo sistema"
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "Numero di cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Informazione cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "Il nome del telefonino"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 msgid "A short description of the mobile phone"
 msgstr "Una breve descrizione del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:74
-#: admin/systems/system-list.xml:78 admin/systems/system-list.xml:225
+#: admin/systems/class_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Telefono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "Numero di serie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "Il numero di serie del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "Numero IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "Il numero IMEI del telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "Sistema Operativo"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "Il sistema operativo installato su questo telefono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "Carta Sim"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "Numero di telefono"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "Il numero di telefono di questo telefono cellulare"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "Numero PUK"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "Il numero PUK della carta sim di questo telefono cellulare"
 
@@ -517,10 +417,18 @@ msgstr "Avvio del terminale"
 msgid "Startup parameters"
 msgstr "Parametri di avvio"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Server principale"
+
 #: 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 "Swap server"
+msgstr "Server di swap"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr "La swap principale che il terminale dovrebbe usare"
@@ -562,112 +470,123 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Server terminale"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "eredita"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Swap locale"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 msgid "Server services"
 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:103
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Errore"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Errore di filtro"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Il filtro non Ã¨ completo!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Informazione"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
-msgstr "Impossibile aggiornare lo stato del servizio prima che questo venga registrato !"
+msgstr ""
+"Impossibile aggiornare lo stato del servizio prima che questo venga "
+"registrato !"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr "Azione \"%s\" sconosciuta"
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 msgid "Could not get execute action %s on service %s."
 msgstr "Impossibile eseguire l'azione %s sul servizio %s "
 
-#: 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Informazione terminale"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "Il nome di %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "Una breve descrizione del %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "LocalitÃ "
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "L'ubicazione di %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "Blocca questo %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr "Questo eviterÃ  che %s venga reinstallato"
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr "Indirizzi IP utilizzati da questo sistema (v4 o v6)"
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr "Impossibile analizzare %s"
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
-msgstr "Nessun server DHCP trovato per all'indirizzo IP %s"
+msgid "No DHCP server found for IPs %s"
+msgstr "Nessun server DHCP provato per gli IP %s"
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "Nessun server DNS trovato per la zona %s"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importa"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr "Il server dal quale si vogliono importare i clienti"
 
@@ -746,16 +665,15 @@ msgstr "Opzione"
 msgid "Special option(s) for this share"
 msgstr "Opzione speciale (i) per questo share"
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr "Ãˆ necessario configurare prima le codifiche"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr "Valore non valido in codifiche : %s"
@@ -807,7 +725,9 @@ msgstr "Dereferenziazione"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:61
 msgid "Specifies how alias dereferencing is done when performing a search"
-msgstr "Specifica come Ã© fatto l'alias di dereferenziazione quando si esegue una ricerca"
+msgstr ""
+"Specifica come Ã© fatto l'alias di dereferenziazione quando si esegue una "
+"ricerca"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
@@ -841,7 +761,9 @@ msgstr "TLS ReqCert"
 msgid ""
 "Specifies what checks to perform on server certificates in a TLS session, if"
 " any"
-msgstr "Specifica quali controlli eseguire sui certificati del server in una sessione TLS, eventualmente"
+msgstr ""
+"Specifica quali controlli eseguire sui certificati del server in una "
+"sessione TLS, eventualmente"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:83
 msgid "TLS CrlCheck"
@@ -851,7 +773,10 @@ msgstr "TLS CrlCheck"
 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 "Specifica se il Certificate Revocation List (CRL) del CA dovrebbe essere utilizzato per verificare se non sono stati revocati i certificati del server"
+msgstr ""
+"Specifica se il Certificate Revocation List (CRL) del CA dovrebbe essere "
+"utilizzato per verificare se non sono stati revocati i certificati del "
+"server"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
@@ -861,148 +786,107 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Elenco dei sistemi"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Server bloccato"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Workstation bloccata"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Terminale bloccato"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Winstation"
-
-#: 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 "Terminale"
-
-#: 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 "Stampante"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Versione"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "PC Windows"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Stampante di rete"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "Telefono cellulare"
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Innesco azione"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Pianifica un'azione"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr "Nuovo oggetto dal modello"
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "Modifica sistema"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Elimina il sistema"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Informazione telefono"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr "Dispositivo telefonico"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "Nome del telefono"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "Breve descrizione del telefono"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "Numero di serie del telefono"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "Numero di telefono di questo telefono"
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Gestione dei sistemi"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr "Azione annullata"
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, 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"
+msgstr ""
+"Il sistema %s non ha un indirizzo MAC definito, impossibile innescare "
+"l'azione"
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr "Il sistema %s Ã© in corso d'installazione"
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr "Servizio d'infrastruttura"
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr "Azione innescata"
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr "Azione chiamata senza errori (il risultato Ã¨ stato \"%s\")"
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Permessi"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "Ereditato da %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "Gestione dei sistemi"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Stampante"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1046,18 +930,6 @@ msgstr "Utenti che sono autorizzati ad utilizzare questa stampante"
 msgid "Users which are allowed to administrate this printer"
 msgstr "Utenti che sono autorizzati ad amministrare questa stampante"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr "Indirizzo IP utilizzato dal sistema"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Indirizzo MAC"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr "Indirizzo MAC di questo sistema"
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "Path per le stampanti in Windows"
@@ -1076,7 +948,9 @@ msgstr "Driver della directory"
 
 #: admin/systems/class_printGeneric.inc:127
 msgid "Path to directory that contains windows drivers for this printer"
-msgstr "Percorso verso la directory che contiene i drivers Windows per questa stampante"
+msgstr ""
+"Percorso verso la directory che contiene i drivers Windows per questa "
+"stampante"
 
 #: admin/systems/class_printGeneric.inc:131
 msgid "Driver name"
@@ -1086,14 +960,20 @@ msgstr "Nome del driver"
 msgid "Windows name of the printer driver"
 msgstr "Nome Windows del driver della stampante"
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr "Informazioni terminale"
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminale"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminale"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr "Informazioni 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)"
@@ -1105,8 +985,8 @@ msgstr "C'Ã¨ un server Argonaut in esecuzione su % 1 (%3://%2:%4)"
 #: 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] "Solo un sistema Ã© configurato per eseguire un cliente Argonaut"
-msgstr[1] "1% dei sistemi sono configurati per eseguire un cliente Argonaut"
+msgstr[0] "Un solo sistema Ã¨ configurato per eseguire un client di Argonaut."
+msgstr[1] "%1 sistemi sono configurati per eseguire un client di Argonaut."
 
 #: addons/dashboard/systems_stats.tpl.c:11
 msgid "But no system is configured to run an argonaut client!"
@@ -1119,110 +999,23 @@ msgid ""
 msgid_plural ""
 "%1 systems are configured to run an argonaut client, but there is no "
 "argonaut server configured!"
-msgstr[0] " Un sistema Ã© configurato per eseguire un cliente Argonaut, ma non c'Ã© alcun server configurato!"
-msgstr[1] " 1% dei sistemi sono configurati per eseguire un cliente Argonaut, ma non c'Ã© alcun server configurato!"
-
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Le azioni che si scelgono qui influenzano tutti i sistemi in questo gruppo di oggetti. Inoltre, tutti i valori modificabili qui possono essere ereditati dai clienti assegnati a questo gruppo di oggetti."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Informazioni"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Seleziona la modalitÃ  del terminale"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Scegli il filesystem NFS da usare"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Scegli il filesystem NFS in cui piazzare il file di swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Azione"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Seleziona l'azione da eseguire per questo terminale"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Esegui"
+msgstr[0] ""
+"Un sistema Ã© configurato per l'esecuzione di un client Argonaut, ma nessun "
+"server Argonaut Ã© stato configurato!"
+msgstr[1] ""
+"%1 sistemi sono configurati per l'esecuzione di un client Argonaut, ma "
+"nessun server Argonaut Ã© stato configurato!"
 
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Questo include tutti i dati degli account, i permessi di accesso al sistema, la configurazione imap, etc. di questo utente. Accertati che vuoi davvero eseguire questa azione visto che poi sarÃ  impossibile per FusionDirectory recuperare i tuoi dati."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
-
 #: 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 "Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi verranno gestiti da questo, percio' se cancellate o disattivate la scheda OPSI, essi verranno rimossi da OPSI"
-
-#: admin/systems/system-filter.tpl.c:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostra i server"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostra le workstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Mostra i terminali"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Mostra le stampanti di rete"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Mostra i telefoni"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Mostra le workstation Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Mostra le periferiche di rete"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "Mostra i telefoni cellulari"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "Indirizzo IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "Proponi un indirizzo IP"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "Indirizzo MAC"
+msgstr ""
+"Attenzione: una volta i sistemi OPSI importati in FustionDirectory, essi "
+"verranno gestiti da questo, percio' se cancellate o disattivate la scheda "
+"OPSI, essi verranno rimossi da OPSI"
diff --git a/systems/locale/lv/fusiondirectory.po b/systems/locale/lv/fusiondirectory.po
index a0d0c8d979a88d2b121b2ea7c3466c69b951d892..4b0d8b2e3889461a1baf38fcea68ec7f2125d714 100644
--- a/systems/locale/lv/fusiondirectory.po
+++ b/systems/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ 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:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "LDAP kÄ¼Å«da"
-
-#: 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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Apraksts"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "DarbÄ«bas"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Izveidot"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "NoÅ†emt"
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "VÄrds "
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "TÄlrunis"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "KÄ¼Å«da"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformÄcija"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "AtraÅ¡anÄs vieta"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "BrÄ«dinÄjums"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "AtÄ¼auja"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1122,107 +991,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ja esat pÄrliecinÄts, spiediet \"izdzÄ“st\", lai turpinÄtu, vai \"Atcelt\", lai pÄrtrauktu. "
-
 #: 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 "Filtrs"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/nb/fusiondirectory.po b/systems/locale/nb/fusiondirectory.po
index 2d889b75eeceafcf7e5b340c5cd7e7b947b21452..31c4c0bc00c91a145fa7fdfe381924252fd3e89f 100644
--- a/systems/locale/nb/fusiondirectory.po
+++ b/systems/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Tjener"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "LDAP-feil"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "Tjener"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Tjener"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Tjener"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Opprett"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Fjern"
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Navn"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Feil"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +777,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/nl/fusiondirectory.po b/systems/locale/nl/fusiondirectory.po
index 50ada1a2b0b1bdc37fc5177ac530a4c38c25b5fd..ad90b42cb815b76ee1462001a9bc421ee3c106f5 100644
--- a/systems/locale/nl/fusiondirectory.po
+++ b/systems/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
-msgstr ""
+msgstr "Netwerk"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
 msgid "Statistics and various information"
-msgstr ""
+msgstr "Statistieken en diverse informatie"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:40
 msgid "DHCP"
@@ -34,56 +34,56 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Systemen"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
-msgstr ""
+msgstr "Statistieken"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
 #: addons/dashboard/class_dashBoardSystems.inc:72
 msgid "Workstations"
-msgstr ""
+msgstr "Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Servers"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
-msgstr ""
+msgstr "Windows Workstations"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
-msgstr ""
+msgstr "Printers"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
-msgstr ""
+msgstr "Telefoon"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
-msgstr ""
+msgstr "Componenten"
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
-msgstr ""
+msgstr "Mobiele telefoon"
 
 #: config/systems/class_systemsPluginConfig.inc:29
 msgid "Systems plugin configuration"
@@ -103,7 +103,7 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Server RDN"
-msgstr ""
+msgstr "Server RDN"
 
 #: config/systems/class_systemsPluginConfig.inc:48
 msgid "Branch in which servers will be stored"
@@ -127,7 +127,7 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Printer RDN"
-msgstr ""
+msgstr "RDN printer"
 
 #: config/systems/class_systemsPluginConfig.inc:63
 msgid "Branch in which printers will be stored"
@@ -185,123 +185,20 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Geactiveerd"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Geblokkeerd"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-msgid "Infrastructure service"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:191
-msgid "Event error"
-msgstr "Event fout"
-
-#: admin/ogroups/goto/class_termgroup.inc:192
-#, php-format
-msgid "Event '%s' is not available!"
-msgstr "Event '%s' is niet beschikbaar!"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Switch off"
-msgstr "Uitschakelen"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Herstarten"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "Onmiddelijk bijwerken"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "Geplande bijwerking"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr "Wake"
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Herinstalleer"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Geheugentest"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "Systeem analyse"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "LDAP fout"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "Systeem"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Systeem groep"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Modus"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Actie vlag"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "server"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
-msgstr ""
-
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "server"
+msgstr "server informatie"
 
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
@@ -316,30 +213,30 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Verwijderen"
 
 #: admin/systems/serverService-list.xml:89
 msgid "Get status"
-msgstr ""
+msgstr "Status verkrijgen"
 
 #: admin/systems/serverService-list.xml:97
 msgid "Start"
@@ -361,164 +258,177 @@ msgstr "Bewerk dienst"
 msgid "Remove service"
 msgstr "Verwijder dienst"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr "IP adres %s"
-
-#: 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 "IP adres"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "Hardware adres (MAC)"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr "Component"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "Netwerk apparatuur"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Naam"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Netwerk instellingen"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP adres"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Mac adress"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "GSM nummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Telefoon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
-msgstr ""
+msgstr "Serienummer"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Opstarten"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
-msgstr "Terminal startup"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
 msgstr "Opstart parameters"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Root server"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Swap server"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Terminal server"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "overerfd"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Lokale swap"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Filter error"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "De filter is niet volledig!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Informatie"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
 msgstr "Kan dienst status niet update zolang het niet opgeslagen is!"
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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: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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Workstation"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "workstation"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "De naam van deze %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "Een korte beschrijving van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Plaats"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "De locatie van de %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr "Blokkeer dit %s"
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Importeren"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr "Optie"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -809,7 +727,7 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "TLS Cert"
-msgstr ""
+msgstr "TLS Cert"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:66
 msgid "Filepath to tls certificate"
@@ -817,7 +735,7 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "TLS Key"
-msgstr ""
+msgstr "TLS sleutel"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:70
 msgid "Filepath to tls key"
@@ -859,160 +777,117 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Lijst met systemen"
 
-#: admin/systems/system-list.xml:14
-msgid "Locked server"
-msgstr "Vergrendelde server"
-
-#: admin/systems/system-list.xml:22
-msgid "Locked workstation"
-msgstr "Vergrendelde workstation"
-
-#: admin/systems/system-list.xml:30
-msgid "Locked terminal"
-msgstr "Vergrendelde terminal"
-
-#: admin/systems/system-list.xml:38
-msgid "Winstation"
-msgstr "Windows werkstation"
-
-#: 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 "Terminal"
-
-#: 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 "Printer"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Distributie versie"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr "winStation"
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Netwerk printer"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Trigger actie"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Plan actie"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Verwijder systeem"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
-msgstr ""
+msgstr "Informatie van de telefoon"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
-msgstr ""
+msgstr "Hardware van de telefoon"
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
-msgstr ""
+msgstr "De naam van de telefoon"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
-msgstr ""
+msgstr "Een korte beschrijving van de telefoon"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
-msgstr ""
+msgstr "De serienummer van de telefoon"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Systeem Management"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
-msgstr ""
+msgstr "Handeling geannuleerd"
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Recht"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr "Overgenomen van %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr "Systeem Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Printer"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
-msgstr ""
+msgstr "Printer informatie"
 
 #: admin/systems/class_printGeneric.inc:62
 msgid "The name of the printer"
-msgstr ""
+msgstr "De naam van de printer"
 
 #: admin/systems/class_printGeneric.inc:66
 msgid "A short description of the printer"
-msgstr ""
+msgstr "Een korte beschrijving van de printer"
 
 #: admin/systems/class_printGeneric.inc:72
 msgid "Details"
@@ -1024,7 +899,7 @@ msgstr "Printer locatie"
 
 #: admin/systems/class_printGeneric.inc:75
 msgid "The location of the printer"
-msgstr ""
+msgstr "De locatie van de printer"
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "Printer URL"
@@ -1032,7 +907,7 @@ msgstr "Printer URL"
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "The URL of the printer"
-msgstr ""
+msgstr "De URL van de printer"
 
 #: admin/systems/class_printGeneric.inc:85
 #: admin/systems/class_printGeneric.inc:88
@@ -1044,18 +919,6 @@ msgstr "Gebruikers die deze printer mogen gebruiken"
 msgid "Users which are allowed to administrate this printer"
 msgstr "Gebruikers die deze printer mogen beheren"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Mac adress"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "Windows paths"
@@ -1084,14 +947,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "De acties die u hier kiest, beinvloeden alle systemen in deze objectgroep. Daarnaast kunnen alle hier bewerkbare waardes overerfd worden door terminal clients die aan deze objectgroep worden toegekend."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Algemeen"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Selecteer terminal modus"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Actie"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Selecteer de voor deze terminal uit te voeren actie"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Commando"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Inclusief alle account data,system access rules,imap opties,etc. Voor deze gebruiker. Gelieve dubbel na te kijken of je dit echt wenst te doen want er is geen andere manier voor FusionDirectory om je data terug te krijgen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
-
 #: 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 "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Toon servers"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Toon werkstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Toon terminals"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "Toon netwerk printer"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "Toon telefoons"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "Toon windows based workstations"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "Toon netwerk apparaten"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "IP adres"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr "IP voorstel"
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "Hardware adres (MAC)"
diff --git a/systems/locale/pl/fusiondirectory.po b/systems/locale/pl/fusiondirectory.po
index f2871ef35eb1d83df587e7ff8971dffcade768ce..a5db9f54030969fe37c7fc0623f02a26b5a48104 100644
--- a/systems/locale/pl/fusiondirectory.po
+++ b/systems/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Systemy"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Serwery"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: admin/ogroups/goto/class_termgroup.inc:68
-msgid "Activated"
-msgstr "Aktywne"
-
-#: admin/ogroups/goto/class_termgroup.inc:69
-msgid "Locked"
-msgstr "Zablokowane"
-
-#: admin/ogroups/goto/class_termgroup.inc:102
-#: 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_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:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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 "WyÅ‚Ä…cz"
-
-#: admin/ogroups/goto/class_termgroup.inc:223
-msgid "Reboot"
-msgstr "Restartuj"
-
-#: admin/ogroups/goto/class_termgroup.inc:224
-msgid "Instant update"
-msgstr "Natychmiastowe uaktualnienie"
-
-#: admin/ogroups/goto/class_termgroup.inc:225
-msgid "Scheduled update"
-msgstr "Zaplanowana aktualizacja"
-
-#: admin/ogroups/goto/class_termgroup.inc:226
-msgid "Wake"
-msgstr ""
-
-#: admin/ogroups/goto/class_termgroup.inc:227
-msgid "Reinstall"
-msgstr "Przeinstaluj"
-
-#: admin/ogroups/goto/class_termgroup.inc:228
-msgid "Memory test"
-msgstr "Test pamiÄ™ci"
-
-#: admin/ogroups/goto/class_termgroup.inc:229
-msgid "System analysis"
-msgstr "Analiza systemu"
-
-#: admin/ogroups/goto/class_termgroup.inc:293
-#: admin/systems/class_networkSettings.inc:310
-msgid "LDAP error"
-msgstr "bÅ‚Ä…d LDAP"
-
-#: admin/ogroups/goto/class_termgroup.inc:301
-msgid "System"
-msgstr "System"
-
-#: admin/ogroups/goto/class_termgroup.inc:302
-msgid "System group"
-msgstr "Grupa systemowa"
-
-#: admin/ogroups/goto/class_termgroup.inc:308
-#: admin/ogroups/goto/termgroup.tpl.c:11
-msgid "Mode"
-msgstr "Tryb"
-
-#: admin/ogroups/goto/class_termgroup.inc:309
-msgid "Action flag"
-msgstr "Flaga akcji"
-
-#: admin/ogroups/goto/class_termgroup.inc:310
-#: 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_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
-msgstr "Serwer Swap"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
+msgstr "Serwer"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Serwer"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Serwer"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Opis"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Akcje"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "UtwÃ³rz"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "UsuÅ„"
 
@@ -361,151 +258,156 @@ msgstr "Edytuj usÅ‚ugÄ™"
 msgid "Remove service"
 msgstr "UsuÅ„ usÅ‚ugÄ™"
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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 "adres IP"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "Adres MAC"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
 msgstr "UrzÄ…dzenia sieciowe"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "WÅ‚aÅ›ciwoÅ›ci"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "adres IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "Telefon komÃ³rkowy"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Startup"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Serwer NFS"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Serwer Swap"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Serwer terminali"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "odziedziczony"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "UsÅ‚ugi"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Informacja"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Import"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr "Opcja"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr "LDAP"
 msgid "List of systems"
 msgstr "Lista systemÃ³w"
 
-#: 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 "Stacja Windows"
-
-#: 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 "Terminal"
-
-#: 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 "Drukarka"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Wersja"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Drukarka sieciowa"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Uprawnienie"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Drukarka"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr "UÅ¼ytkownicy ktÃ³rzy mogÄ… uÅ¼ywaÄ‡ tej drukarki"
 msgid "Users which are allowed to administrate this printer"
 msgstr "UÅ¼ytkownicy, ktÃ³rzy mogÄ… administrowaÄ‡ tÄ… drukarkÄ…"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +947,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "Terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1124,107 +993,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "Akcje wybrane tutaj wpÅ‚ywajÄ… na wszystkie systemy w tej grupie obiektÃ³w. Dodatkowo wszystkie wartoÅ›ci edytowalne tutaj mogÄ… byÄ‡ odziedziczone przez klientÃ³w przypisanych do tych grup obiektÃ³w."
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "OgÃ³lne"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "ProszÄ™ wybraÄ‡ tryb terminala"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "ProszÄ™ wybraÄ‡ gÅ‚Ã³wny system plikÃ³w NFS"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "ProszÄ™ wybraÄ‡ system plikÃ³w NFS dla plikÃ³w swap"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Akcja"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "ProszÄ™ wybraÄ‡ akcjÄ™ do wykonania dla tego terminala"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Uruchom"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "JeÅ›li jesteÅ› pewien - naciÅ›nij 'UsuÅ„' aby kontynuowaÄ‡ lub 'Anuluj' aby anulowaÄ‡."
-
 #: 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 "Filtr"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "PokaÅ¼ serwery"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "PokaÅ¼ stacje robocze"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "PokaÅ¼ terminale"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "PokaÅ¼ telefony"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "PokaÅ¼ urzÄ…dzenia sieciowe"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "adres IP"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "adres MAC"
diff --git a/systems/locale/pt/fusiondirectory.po b/systems/locale/pt/fusiondirectory.po
index 17b2fc8d9c2d40623d1f262e7b9e78aa7d6939fa..ee55597ba6dde1d7a1ac711046a0dd36ad4bee72 100644
--- a/systems/locale/pt/fusiondirectory.po
+++ b/systems/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Servidor"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "Erro de LDAP"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "Servidor"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Servidor"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Servidor"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "DescriÃ§Ã£o"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "AÃ§Ãµes"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Criar"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Remover"
 
@@ -361,151 +258,156 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Propriedades"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Nome"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Fone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "InÃcio"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Erro"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "InformaÃ§Ã£o"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "EstaÃ§Ã£o de trabalho"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "LocalizaÃ§Ã£o"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr ""
 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 "Impressora"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impressora"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Geral"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "EntÃ£o, se vocÃª tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
-
 #: 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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/pt_BR/fusiondirectory.po b/systems/locale/pt_BR/fusiondirectory.po
index 04f6a715f94dafbe3167b3598e88c287bda822da..45e639c34601a1d0897a6336c905cea02c415f94 100644
--- a/systems/locale/pt_BR/fusiondirectory.po
+++ b/systems/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,9 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:29
 msgid "Statistics and various information"
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
-msgstr ""
+msgstr "Sistemas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
-msgstr ""
+msgstr "EstatÃsticas"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
-msgstr ""
+msgstr "Servidores"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:85
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #: config/systems/class_systemsPluginConfig.inc:89
 msgid "Available encodings for share services"
@@ -175,7 +175,7 @@ msgstr ""
 
 #: config/systems/class_systemsPluginConfig.inc:98
 msgid "Label"
-msgstr ""
+msgstr "RÃ³tulo"
 
 #: config/systems/class_systemsPluginConfig.inc:98
 msgid "The encoding displayed name"
@@ -185,157 +185,54 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "servidor"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
-msgstr ""
+msgstr "servidor"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
-msgstr ""
+msgstr "Lista de serviÃ§os"
 
 #: admin/systems/serverService-list.xml:14
 msgid "Service"
-msgstr ""
+msgstr "ServiÃ§o"
 
 #: admin/systems/serverService-list.xml:27
 msgid "!"
-msgstr ""
+msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
-msgstr ""
+msgstr "DescriÃ§Ã£o"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
-msgstr ""
+msgstr "AÃ§Ãµes"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
-msgstr ""
+msgstr "Remover"
 
 #: admin/systems/serverService-list.xml:89
 msgid "Get status"
@@ -343,163 +240,168 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:97
 msgid "Start"
-msgstr ""
+msgstr "ComeÃ§ar"
 
 #: admin/systems/serverService-list.xml:105
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: admin/systems/serverService-list.xml:113
 msgid "Restart"
-msgstr ""
+msgstr "RecomeÃ§ar"
 
 #: admin/systems/serverService-list.xml:121
 msgid "Edit service"
-msgstr ""
+msgstr "Editar serviÃ§o"
 
 #: admin/systems/serverService-list.xml:129
 msgid "Remove service"
-msgstr ""
-
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
+msgstr "Remover serviÃ§o"
 
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
-msgstr ""
+msgstr "Componente"
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 msgid "Network device"
-msgstr ""
+msgstr "Dispositivo de rede"
 
-#: 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
-msgstr ""
+msgstr "Propriedades"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "ConfiguraÃ§Ãµes de rede"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "EndereÃ§o IP"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "EndereÃ§o MAC"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
 msgstr ""
 
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
-msgstr ""
+msgstr "Telefone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
-msgstr ""
+msgstr "NÃºmero de SÃ©rie"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
-msgstr ""
+msgstr "NÃºmero de sÃ©rie do telefone celular"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
-msgstr ""
+msgstr "NÃºmero do IMEI"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
-msgstr ""
+msgstr "O sistema operacional instalado neste telefone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
-msgstr ""
+msgstr "NÃºmero de telefone"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -513,12 +415,20 @@ msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:50
 msgid "Startup parameters"
-msgstr ""
+msgstr "Parametros de inicializaÃ§Ã£o"
+
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "Servidor raiz"
 
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Servidor de Swap"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -529,27 +439,27 @@ msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:67
 msgid "Connect method"
-msgstr ""
+msgstr "MÃ©todo de conexÃ£o"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
 msgid "XDMCP"
-msgstr ""
+msgstr "XDMCP"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
 msgid "LDM"
-msgstr ""
+msgstr "LDM"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
 msgid "Shell"
-msgstr ""
+msgstr "Shell"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
 msgid "Telnet"
-msgstr ""
+msgstr "Telnet"
 
 #: admin/systems/class_terminalStartup.inc:71
 #: admin/systems/services/terminal/class_serviceTerminal.inc:59
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "herdadas"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr "Ãrea de Swap local"
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
-msgstr ""
+msgstr "ServiÃ§os"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 msgid "Server services"
-msgstr ""
+msgstr "ServiÃ§os do servidor"
 
-#: 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
-msgstr ""
+msgstr "InformaÃ§Ã£o"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Cannot update service status until it has been saved!"
+msgstr "NÃ£o Ã© possÃvel atualizar o status do serviÃ§o atÃ© que este seja salvo!"
+
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
 msgstr ""
 
-#: admin/systems/class_serverService.inc:416
-#: admin/systems/class_serverService.inc:425
-#: admin/systems/class_serverService.inc:436
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
-msgstr ""
+msgstr "EstaÃ§Ã£o de trabalho"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
-msgstr ""
+msgstr "LocalizaÃ§Ã£o"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
-msgstr ""
+msgstr "Importar"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -714,7 +633,7 @@ msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #: admin/systems/services/shares/class_serviceShare.inc:59
 msgid "Type of share"
@@ -738,22 +657,21 @@ msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Option"
-msgstr ""
+msgstr "OpÃ§Ã£o"
 
 #: admin/systems/services/shares/class_serviceShare.inc:72
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -761,7 +679,7 @@ msgstr ""
 #: admin/systems/services/ldap/class_serviceLDAP.inc:35
 #: admin/systems/services/ldap/class_serviceLDAP.inc:96
 msgid "LDAP service"
-msgstr ""
+msgstr "ServiÃ§o LDAP"
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:39
 msgid "LDAP Base"
@@ -853,154 +771,111 @@ msgstr ""
 
 #: admin/systems/services/ldap/class_serviceLDAP.inc:97
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: 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 ""
+msgstr "Lista de sistemas"
 
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
-msgstr ""
+msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
-msgstr ""
+msgstr "LiberaÃ§Ã£o"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
-msgstr ""
+msgstr "AÃ§Ã£o do gatilho"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
+msgstr "Programar aÃ§Ã£o"
+
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
-msgstr ""
+msgstr "Remover sistema"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr "Gerenciamento de Sistemas"
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
-msgstr ""
+msgstr "HeranÃ§a de %s"
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Impressora"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1016,11 +891,11 @@ msgstr ""
 
 #: admin/systems/class_printGeneric.inc:72
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #: admin/systems/class_printGeneric.inc:75
 msgid "Printer location"
-msgstr ""
+msgstr "LocalizaÃ§Ã£o da impressora"
 
 #: admin/systems/class_printGeneric.inc:75
 msgid "The location of the printer"
@@ -1028,7 +903,7 @@ msgstr ""
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "Printer URL"
-msgstr ""
+msgstr "URL da impressora"
 
 #: admin/systems/class_printGeneric.inc:79
 msgid "The URL of the printer"
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "EndereÃ§o MAC"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +947,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1120,55 +989,9 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
-msgstr ""
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
+msgstr "Base"
 
 #: admin/systems/server_import.tpl.c:2
 msgid ""
@@ -1176,51 +999,3 @@ msgid ""
 " 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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/ru/fusiondirectory.po b/systems/locale/ru/fusiondirectory.po
index c60465755f7a62d8a5540d78120a843c2efb21b1..97c5b9bfe3aa08960740a165edc5ea42532b8d47 100644
--- a/systems/locale/ru/fusiondirectory.po
+++ b/systems/locale/ru/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Alexey Matveev, 2016
-# Alexey Matveev, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +19,6 @@ 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:319
 msgid "Network"
 msgstr "Ð¡ÐµÑ‚ÑŒ"
 
@@ -36,22 +34,22 @@ msgstr "DHCP"
 msgid "DNS"
 msgstr "DNS"
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "Ð¡Ð¸ÑÑ‚ÐµÐ¼Ñ‹"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr "Ð¡Ñ‚Ð°Ñ‚Ð¸ÑÑ‚Ð¸ÐºÐ°"
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -59,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€Ñ‹"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Windows"
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ñ‹"
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr "ÐŸÑ€Ð¸Ð½Ñ‚ÐµÑ€Ñ‹"
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
 
@@ -187,124 +185,21 @@ msgstr "ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸"
 msgid "Encodings"
 msgstr "ÐšÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸"
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° LDAP"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ðµ"
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -318,24 +213,24 @@ msgid "!"
 msgstr "!"
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
@@ -363,151 +258,156 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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 "IP Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/class_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "MAC Ð°Ð´Ñ€ÐµÑ"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
-msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
+msgstr "Ð¤Ð°Ð¼Ð¸Ð»Ð¸Ñ"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr "IP Ð°Ð´Ñ€ÐµÑ"
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr "Mac Ð°Ð´Ñ€ÐµÑ"
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ðµ"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr "Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr "Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr "IMEI Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr "IMEI Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr "ÐžÐ¡"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑ‚ÐµÐ¼Ð° ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr "Ð¡Ð¸Ð¼ÐšÐ°Ñ€Ñ‚Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr "ÐÐ¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr "PUK Ð½Ð¾Ð¼ÐµÑ€"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr "PUK Ð½Ð¾Ð¼ÐµÑ€ ÑÐ¸Ð¼ ÐºÐ°Ñ€Ñ‚Ñ‹ Ð² Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ðµ "
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Ð—Ð°Ð¿ÑƒÑÐº"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -517,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ Ð·Ð°Ð¿ÑƒÑÐºÐ°"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐµÑ€Ð²ÐµÑ€"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -562,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»-ÑÐµÑ€Ð²ÐµÑ€"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "Ð¡ÐµÑ€Ð²Ð¸ÑÑ‹"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€ Ð½ÐµÐ¿Ð¾Ð»Ð½Ñ‹Ð¹!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ñ€Ð°Ð±Ð¾Ñ‡ÐµÐ¹ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr "Ñ€Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ"
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr "ÐœÐµÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ %s"
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½ DNS ÑÐµÑ€Ð²ÐµÑ€ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ %s"
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -700,7 +617,7 @@ msgstr ""
 
 #: admin/systems/services/shares/class_serviceShare.inc:42
 msgid "Shares"
-msgstr ""
+msgstr "Ð¨Ð°Ñ€Ñ‹"
 
 #: admin/systems/services/shares/class_serviceShare.inc:47
 msgid "Shares this server hosts"
@@ -746,16 +663,15 @@ msgstr "ÐžÐ¿Ñ†Ð¸Ð¸"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -861,148 +777,105 @@ msgstr "LDAP"
 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 "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Windows"
-
-#: 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr "IP"
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr "MAC"
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "Ð¡ÐµÑ‚ÐµÐ²Ð¾Ð¹ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr "ÐœÐ¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½"
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð¿Ð¾ Ñ‚Ñ€Ð¸Ð³Ð³ÐµÑ€Ñƒ"
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ð¿Ð¾ Ñ€Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸ÑŽ"
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ"
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± Ñ‚ÐµÐ»ÐµÐ¾Ñ„Ð¾Ð½Ðµ"
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr "Ð¡ÐµÑ€Ð¸Ð¹Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½Ð½Ñ‹Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ñƒ ÑÑ‚Ð¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°"
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "ÐŸÑ€Ð°Ð²Ð°"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Ð’Ð°Ð¼ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ ÑÐ½Ð°Ð¿ÑˆÐ¾Ñ‚ Ð´Ð»Ñ %s."
-
-#: admin/systems/class_systemManagement.inc:483
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Ð’Ð°Ð¼ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ ÑÐ½Ð°Ð¿ÑˆÐ¾Ñ‚ Ð´Ð»Ñ %s."
-
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "ÐŸÑ€Ð¸Ð½Ñ‚ÐµÑ€"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1046,18 +919,6 @@ msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒ
 msgid "Users which are allowed to administrate this printer"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr "Mac Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr "ÐŸÑƒÑ‚Ð¸ windows"
@@ -1076,7 +937,8 @@ msgstr "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð°"
 
 #: admin/systems/class_printGeneric.inc:127
 msgid "Path to directory that contains windows drivers for this printer"
-msgstr "ÐŸÑƒÑ‚ÑŒ Ðº Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ windows Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
+msgstr ""
+"ÐŸÑƒÑ‚ÑŒ Ðº Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ windows Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€ Ð´Ð»Ñ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ð°"
 
 #: admin/systems/class_printGeneric.inc:131
 msgid "Driver name"
@@ -1086,12 +948,18 @@ msgstr "Ð˜Ð¼Ñ Ð´Ñ€Ð°Ð¹Ð²ÐµÑ€Ð°"
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Ð¢ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1126,55 +994,9 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "ÐžÐ±Ñ‰ÐµÐµ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ€ÐµÐ¶Ð¸Ð¼ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð°"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð½ÐµÐ²ÑƒÑŽ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NFS"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÑƒÑŽ ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ NFS Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¿Ð¾Ð´ÐºÐ°Ñ‡ÐºÐ¸"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð½Ð° ÑÑ‚Ð¾Ð¼ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ðµ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
-msgstr "Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ"
-
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "Ð˜Ñ‚Ð°Ðº - ÐµÑÐ»Ð¸ Ð²Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ - Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ 'Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð»Ð¸ 'ÐžÑ‚Ð¼ÐµÐ½Ð°' Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ."
+msgstr "Ð’ÐµÑ‚ÐºÐ°"
 
 #: admin/systems/server_import.tpl.c:2
 msgid ""
@@ -1182,51 +1004,3 @@ msgid ""
 " 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 "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€Ð°"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ ÑÐµÑ‚ÐµÐ²Ñ‹Ðµ Ð¿Ñ€Ð¸Ð½Ñ‚ÐµÑ€Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ€Ð°Ð±Ð¾Ñ‡Ð¸Ðµ ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸ Ñ Windows"
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ ÑÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð°"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ‹"
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "IP-Ð°Ð´Ñ€ÐµÑ"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "MAC-Ð°Ð´Ñ€ÐµÑ"
diff --git a/systems/locale/ru@petr1708/fusiondirectory.po b/systems/locale/ru@petr1708/fusiondirectory.po
index 9cf7138f9e83c44e54915250cdfa0da6b90cc37f..2f470e63fc5f0228d00067320833f3d70c3a7377 100644
--- a/systems/locale/ru@petr1708/fusiondirectory.po
+++ b/systems/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,6 @@ 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:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +33,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +56,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +184,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +212,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +257,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +416,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +469,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +662,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +776,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +918,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +946,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1124,107 +992,13 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/sv/fusiondirectory.po b/systems/locale/sv/fusiondirectory.po
index e9250639f8b692eafc8911b2d0f3cc1b58c9d167..0a5975ef07624c665e472c9279baab4b6f93ad61 100644
--- a/systems/locale/sv/fusiondirectory.po
+++ b/systems/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "System"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "Server"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "LDAP-fel"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "Server"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "Server"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "Server"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "Beskrivning"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "Ã…tgÃ¤rder"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Skapa"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -361,151 +258,156 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "Namn"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Telefon"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Starta upp"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr "Uppstartsparametrar"
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "TjÃ¤nster"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Fel"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr "Filterfel"
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr "Filtret Ã¤r inte komplett!"
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "Information"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "Arbetsstation"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Plats"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Varning"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr ""
 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 "Winstation"
-
-#: 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 "Terminal"
-
-#: 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 "Skrivare"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "Release"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "RÃ¤ttighet"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "Skrivare"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +947,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "Terminal"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Terminal"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1120,107 +989,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "Generisk"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "Ã…tgÃ¤rd"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "Exekvera"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "Bas"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr "Detta inkluderar alla kontodata, systemrÃ¤ttighetsregler, imapinstÃ¤llningar, etc. fÃ¶r den hÃ¤r anvÃ¤ndaren. VÃ¤nligen dubbelkolla att du verkligen vill gÃ¶ra detta eftersom det inte finns nÃ¥got sÃ¤tt fÃ¶r FusionDirectory att fÃ¥ tillbaka informationen."
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "SÃ¥ - om du Ã¤r sÃ¤ker - tryck 'Ta bort' fÃ¶r att fortsÃ¤tta och 'Avbryt' fÃ¶r att avbryta."
-
 #: 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 "Filter"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Visa servrar"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Visa workstations"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "Visa terminaler"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/ug/fusiondirectory.po b/systems/locale/ug/fusiondirectory.po
index c5f24aa142f6170d8c7820f096453a5f6838a7b9..61596fb7070b18c212d3afd8ec833feac0f8054b 100644
--- a/systems/locale/ug/fusiondirectory.po
+++ b/systems/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +33,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +56,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +184,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-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"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:311
-#: admin/systems/class_terminalStartup.inc:57
-#: admin/ogroups/goto/termgroup.tpl.c:23
-msgid "Swap server"
+#: admin/systems/class_serverGeneric.inc:28
+msgid "server"
 msgstr ""
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr ""
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +212,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr ""
 
@@ -361,145 +257,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +416,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +469,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +662,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,147 +776,104 @@ msgstr ""
 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
 msgstr ""
 
 #: admin/systems/class_printGeneric.inc:31
@@ -1044,18 +918,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,12 +946,18 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
+#: admin/systems/class_terminalGeneric.inc:31
+msgid "terminal"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:55
-msgid "terminal"
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr ""
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
 msgstr ""
 
 #: addons/dashboard/systems_stats.tpl.c:2
@@ -1118,107 +986,13 @@ msgid_plural ""
 "argonaut server configured!"
 msgstr[0] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/vi_VN/fusiondirectory.po b/systems/locale/vi_VN/fusiondirectory.po
index c444d5d77c90af3afe44fedc6850f6522bba6531..6a8069c174986d03cb186fa76a700eb53c3363e3 100644
--- a/systems/locale/vi_VN/fusiondirectory.po
+++ b/systems/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "CÃ¡c há»‡ thá»‘ng"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "Lá»—i LDAP"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "MÃ¡y chá»§ (server)"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "MÃ¡y chá»§ (server)"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "MÃ¡y chá»§ (server)"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "MÃ´ táº£"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "CÃ¡c thao tÃ¡c"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "Táº¡o "
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "XÃ³a bá»"
 
@@ -361,151 +258,156 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr ""
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: admin/systems/class_printGeneric.inc:58
 msgid "Properties"
 msgstr "Properties"
 
-#: admin/systems/class_componentGeneric.inc:63
-#: admin/systems/class_mobilePhoneGeneric.inc:63
-#: admin/systems/class_workstationGeneric.inc:160
+#: admin/systems/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "TÃªn"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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"
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
 msgstr ""
 
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
 #: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
+msgid "Mobile phone"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "Sá»‘ Ä‘iá»‡n thoáº¡i"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:32
 msgid "Startup"
-msgstr "Khá»Ÿi Ä‘á»™ng"
+msgstr ""
 
 #: admin/systems/class_terminalStartup.inc:33
 msgid "Terminal startup"
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr ""
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr ""
 msgid "Terminal server"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr ""
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "Lá»—i"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "ThÃ´ng tin"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "MÃ¡y tráº¡m"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "Vá»‹ trÃ"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr ""
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr "LDAP"
 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 "Thiáº¿t bá»‹ cuá»‘i "
-
-#: 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 "MÃ¡y in"
-
-#: admin/systems/system-list.xml:128
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr ""
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr ""
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:171
 msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
 msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "Cho phÃ©p"
-
-#: admin/systems/class_systemManagement.inc:420
-#, 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:483
-#, 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:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "MÃ¡y in"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr ""
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +947,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "Thiáº¿t bá»‹ cuá»‘i "
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "Thiáº¿t bá»‹ cuá»‘i "
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1118,107 +987,13 @@ msgid_plural ""
 "argonaut server configured!"
 msgstr[0] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "ThÃ´ng tin chung"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr ""
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "CÆ¡ sá»Ÿ"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr "VÃ¬ tháº¿ náº¿u báº¡n cháº¯c cháº¯n hÃ£y nháº¥n \"XÃ³a bá»\" Ä‘á»ƒ tiáº¿p tá»¥c hoáº·c'Há»§y bá»' Ä‘á»ƒ dá»«ng láº¡i."
-
 #: 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 ""
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr ""
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr ""
diff --git a/systems/locale/zh/fusiondirectory.po b/systems/locale/zh/fusiondirectory.po
index 2995543329fccc5887b5469238badf5b6e55976b..c8d902bed822dd34ef842b8436737d2f8d71273e 100644
--- a/systems/locale/zh/fusiondirectory.po
+++ b/systems/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-03-26 16:13+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: addons/dashboard/class_dashBoardNetwork.inc:28
-#: admin/systems/class_networkSettings.inc:319
 msgid "Network"
 msgstr ""
 
@@ -34,22 +34,22 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:29
+#: addons/dashboard/class_dashBoardSystems.inc:30
 #: config/systems/class_systemsPluginConfig.inc:28
-#: admin/systems/class_systemManagement.inc:700
-#: admin/systems/class_systemManagement.inc:704
+#: admin/systems/class_systemManagement.inc:43
+#: admin/systems/class_systemManagement.inc:47
 msgid "Systems"
 msgstr "ç³»ç»Ÿè®¾ç½®"
 
-#: addons/dashboard/class_dashBoardSystems.inc:30
+#: addons/dashboard/class_dashBoardSystems.inc:31
 msgid "Statistics and information about systems"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:41
+#: addons/dashboard/class_dashBoardSystems.inc:42
 msgid "Statistics"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:46
+#: addons/dashboard/class_dashBoardSystems.inc:47
 msgid "Computer name to use by unit"
 msgstr ""
 
@@ -57,31 +57,31 @@ msgstr ""
 msgid "Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:75
+#: addons/dashboard/class_dashBoardSystems.inc:76
 msgid "Servers"
 msgstr "æœåŠ¡å™¨"
 
-#: addons/dashboard/class_dashBoardSystems.inc:78
+#: addons/dashboard/class_dashBoardSystems.inc:80
 msgid "Windows Workstations"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:81
+#: addons/dashboard/class_dashBoardSystems.inc:84
 msgid "Terminals"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:84
+#: addons/dashboard/class_dashBoardSystems.inc:88
 msgid "Printers"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:87
+#: addons/dashboard/class_dashBoardSystems.inc:92
 msgid "Phones"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:90
+#: addons/dashboard/class_dashBoardSystems.inc:96
 msgid "Components"
 msgstr ""
 
-#: addons/dashboard/class_dashBoardSystems.inc:93
+#: addons/dashboard/class_dashBoardSystems.inc:100
 msgid "Mobile phones"
 msgstr ""
 
@@ -185,124 +185,21 @@ msgstr ""
 msgid "Encodings"
 msgstr ""
 
-#: 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_terminalStartup.inc:120
-msgid "Local swap"
-msgstr ""
-
-#: 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/ogroups/goto/class_termgroup.inc:187
-#: admin/systems/class_workstationGeneric.inc:284
-#: admin/systems/class_systemManagement.inc:189
-#: admin/systems/class_systemManagement.inc:214
-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:310
-msgid "LDAP error"
-msgstr "LDAP é”™è¯¯"
-
-#: 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"
-msgstr ""
-
-#: 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/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_serverGeneric.inc:28
+msgid "server"
+msgstr "æœåŠ¡å™¨"
 
-#: 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
+#: admin/systems/class_serverGeneric.inc:39
+#: admin/systems/class_serverGeneric.inc:44
+#: admin/systems/class_serverGeneric.inc:45
+#: admin/systems/class_systemImport.inc:175
 msgid "Server"
 msgstr "æœåŠ¡å™¨"
 
-#: admin/systems/class_serverGeneric.inc:33
+#: admin/systems/class_serverGeneric.inc:40
 msgid "Server information"
 msgstr ""
 
-#: admin/systems/class_serverGeneric.inc:55
-msgid "server"
-msgstr "æœåŠ¡å™¨"
-
 #: admin/systems/serverService-list.xml:10
 msgid "List of services"
 msgstr ""
@@ -316,24 +213,24 @@ msgid "!"
 msgstr ""
 
 #: 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/class_componentGeneric.inc:62
+#: admin/systems/class_mobilePhoneGeneric.inc:64
+#: admin/systems/class_workstationGeneric.inc:68
 #: admin/systems/services/shares/class_serviceShare.inc:55
-#: admin/systems/system-list.xml:144 admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/system-list.xml:55 admin/systems/class_phoneGeneric.inc:59
 #: admin/systems/class_printGeneric.inc:66
 msgid "Description"
 msgstr "æè¿°"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:168
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:79
 msgid "Actions"
 msgstr "åŠ¨ä½œ"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:179
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:90
 msgid "Create"
 msgstr "åˆ›å»º"
 
-#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:272
+#: admin/systems/serverService-list.xml:69 admin/systems/system-list.xml:119
 msgid "Remove"
 msgstr "åˆ é™¤"
 
@@ -361,145 +258,150 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_networkSettings.inc:240
-#, php-format
-msgid "IP address %s"
-msgstr ""
-
-#: 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_networkSettings.inc:263
-#: admin/systems/class_networkSettings.inc:265
-#: admin/systems/class_networkSettings.inc:327
-msgid "MAC address"
-msgstr "MAC åœ°å€"
-
-#: 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_componentGeneric.inc:36
-#: admin/systems/system-list.xml:94
+#: admin/systems/class_componentGeneric.inc:31
 msgid "Component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:37
+#: admin/systems/class_componentGeneric.inc:32
 msgid "Component information"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:41
-#: admin/systems/class_componentGeneric.inc:42
-#: admin/systems/system-list.xml:233
+#: admin/systems/class_componentGeneric.inc:36
+#: admin/systems/class_componentGeneric.inc:37
 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_componentGeneric.inc:55
+#: admin/systems/class_mobilePhoneGeneric.inc:56
+#: admin/systems/class_workstationGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:52
 #: 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/class_componentGeneric.inc:58
+#: admin/systems/class_mobilePhoneGeneric.inc:60
+#: admin/systems/class_workstationGeneric.inc:63
 #: admin/systems/services/shares/class_serviceShare.inc:51
-#: admin/systems/system-list.xml:120 admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/system-list.xml:31 admin/systems/class_phoneGeneric.inc:55
 #: admin/systems/class_printGeneric.inc:62
-#: admin/systems/system-filter.tpl.c:29
 msgid "Name"
 msgstr "åç§°"
 
-#: admin/systems/class_componentGeneric.inc:63
+#: admin/systems/class_componentGeneric.inc:58
 msgid "The name of the component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:67
+#: admin/systems/class_componentGeneric.inc:62
 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
+#: admin/systems/class_componentGeneric.inc:69
+#: admin/systems/class_mobilePhoneGeneric.inc:102
+#: admin/systems/class_workstationGeneric.inc:90
+#: admin/systems/class_phoneGeneric.inc:79
+#: admin/systems/class_printGeneric.inc:103
+msgid "Network settings"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:106
+#: admin/systems/class_printGeneric.inc:108
+msgid "IP address this system uses"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address"
+msgstr ""
+
+#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:110
+#: admin/systems/class_workstationGeneric.inc:100
+#: admin/systems/class_phoneGeneric.inc:89
+#: admin/systems/class_printGeneric.inc:113
+msgid "Mac address of this system"
+msgstr ""
+
+#: admin/systems/class_mobilePhoneGeneric.inc:32
+#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:38
 msgid "Mobile phone"
 msgstr "ç§»åŠ¨ç”µè¯"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:37
+#: admin/systems/class_mobilePhoneGeneric.inc:33
 msgid "Mobile phone information"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:63
+#: admin/systems/class_mobilePhoneGeneric.inc:60
 msgid "The name of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:67
+#: admin/systems/class_mobilePhoneGeneric.inc:64
 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_mobilePhoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:32
 #: admin/systems/class_phoneGeneric.inc:36
-#: admin/systems/class_phoneGeneric.inc:40
-#: admin/systems/class_phoneGeneric.inc:70
+#: admin/systems/class_phoneGeneric.inc:66
 msgid "Phone"
 msgstr "ç”µè¯"
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_mobilePhoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "Serial Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:73
 msgid "The serial number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "IMEI Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:81
+#: admin/systems/class_mobilePhoneGeneric.inc:77
 msgid "The IMEI number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "OS"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:86
+#: admin/systems/class_mobilePhoneGeneric.inc:82
 msgid "The Operating System installed on this phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:92
+#: admin/systems/class_mobilePhoneGeneric.inc:88
 msgid "SimCard"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_mobilePhoneGeneric.inc:91
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "Telephone Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:95
+#: admin/systems/class_mobilePhoneGeneric.inc:91
 msgid "The telephone number of the mobile phone"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "PUK Number"
 msgstr ""
 
-#: admin/systems/class_mobilePhoneGeneric.inc:99
+#: admin/systems/class_mobilePhoneGeneric.inc:95
 msgid "The PUK number of the simcard in this mobile phone"
 msgstr ""
 
@@ -515,10 +417,18 @@ msgstr ""
 msgid "Startup parameters"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:53
+msgid "Root server"
+msgstr "æ ¹æœåŠ¡å™¨"
+
 #: admin/systems/class_terminalStartup.inc:53
 msgid "The root server the terminal should be using"
 msgstr ""
 
+#: admin/systems/class_terminalStartup.inc:57
+msgid "Swap server"
+msgstr "äº¤æ¢æœåŠ¡å™¨"
+
 #: admin/systems/class_terminalStartup.inc:57
 msgid "The swap server the terminal should be using"
 msgstr ""
@@ -560,112 +470,121 @@ msgstr "Windows RDP"
 msgid "Terminal server"
 msgstr "ç»ˆç«¯æœåŠ¡å™¨"
 
-#: admin/systems/class_serverService.inc:57
+#: admin/systems/class_terminalStartup.inc:111
+#: admin/systems/class_terminalStartup.inc:122
+msgid "inherited"
+msgstr "ç»§æ‰¿"
+
+#: admin/systems/class_terminalStartup.inc:119
+msgid "Local swap"
+msgstr ""
+
+#: admin/systems/class_serverService.inc:60
 #: 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
+#: admin/systems/system-list.xml:63
 msgid "Services"
 msgstr "æœåŠ¡"
 
-#: admin/systems/class_serverService.inc:58
+#: admin/systems/class_serverService.inc:61
 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
+#: admin/systems/class_serverService.inc:209
+#: admin/systems/class_serverService.inc:277
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "Error"
 msgstr "é”™è¯¯"
 
-#: admin/systems/class_serverService.inc:333
-msgid "Filter error"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:333
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 msgid "Information"
 msgstr "æç¤ºä¿¡æ¯"
 
-#: admin/systems/class_serverService.inc:388
+#: admin/systems/class_serverService.inc:271
 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
+#: admin/systems/class_serverService.inc:277
+#, php-format
+msgid "Unknown action \"%s\""
+msgstr ""
+
+#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:308
+#: admin/systems/class_serverService.inc:319
 #, php-format
 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
+#: admin/systems/class_workstationGeneric.inc:32
+#: admin/systems/class_workstationGeneric.inc:37
+#: admin/systems/class_workstationGeneric.inc:38
 msgid "Workstation"
 msgstr "å·¥ä½œç«™"
 
-#: admin/systems/class_workstationGeneric.inc:128
+#: admin/systems/class_workstationGeneric.inc:33
 msgid "Workstation information"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:150
+#: admin/systems/class_workstationGeneric.inc:52
 msgid "workstation"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:161
+#: admin/systems/class_workstationGeneric.inc:64
 #, php-format
 msgid "The name of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:167
+#: admin/systems/class_workstationGeneric.inc:69
 #, php-format
 msgid "A short description of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:172
+#: admin/systems/class_workstationGeneric.inc:73
 msgid "Location"
 msgstr "ä½ç½®"
 
-#: admin/systems/class_workstationGeneric.inc:173
+#: admin/systems/class_workstationGeneric.inc:74
 #, php-format
 msgid "The location of the %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:179
+#: admin/systems/class_workstationGeneric.inc:78
 #, php-format
 msgid "Lock this %s"
 msgstr ""
 
-#: admin/systems/class_workstationGeneric.inc:180
+#: admin/systems/class_workstationGeneric.inc:79
 #, php-format
 msgid "This will prevent the %s from being reinstalled"
 msgstr ""
 
+#: admin/systems/class_workstationGeneric.inc:95
+#: admin/systems/class_phoneGeneric.inc:84
+msgid "IP addresses this system uses (v4 or v6)"
+msgstr ""
+
 #: admin/systems/class_systemImport.inc:72
 #, php-format
 msgid "Could not parse %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:116
+#: admin/systems/class_systemImport.inc:120
 #, php-format
-msgid "No DHCP server found for ip %s"
+msgid "No DHCP server found for IPs %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:130
+#: admin/systems/class_systemImport.inc:137
 #, php-format
 msgid "No DNS server found for zone %s"
 msgstr ""
 
-#: admin/systems/class_systemImport.inc:165
+#: admin/systems/class_systemImport.inc:171
 msgid "Import"
 msgstr "å¯¼å…¥"
 
-#: admin/systems/class_systemImport.inc:169
+#: admin/systems/class_systemImport.inc:175
 msgid "The server you wish to import hosts from"
 msgstr ""
 
@@ -744,16 +663,15 @@ msgstr "é€‰é¡¹"
 msgid "Special option(s) for this share"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:103
+#: admin/systems/services/shares/class_serviceShare.inc:105
 msgid "You need to configure encodings first"
 msgstr ""
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
-#: admin/ogroups/goto/termgroup.tpl.c:2 admin/systems/remove.tpl.c:2
+#: admin/systems/services/shares/class_serviceShare.inc:112
 msgid "Warning"
 msgstr "è¦å‘Š"
 
-#: admin/systems/services/shares/class_serviceShare.inc:110
+#: admin/systems/services/shares/class_serviceShare.inc:112
 #, php-format
 msgid "Invalid value in encodings : %s"
 msgstr ""
@@ -859,148 +777,105 @@ msgstr ""
 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 "Windows å·¥ä½œç«™"
-
-#: 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
+#: admin/systems/system-list.xml:39
 msgid "IP"
 msgstr ""
 
-#: admin/systems/system-list.xml:136
+#: admin/systems/system-list.xml:47
 msgid "MAC"
 msgstr ""
 
-#: admin/systems/system-list.xml:160
+#: admin/systems/system-list.xml:71
 msgid "Release"
 msgstr "å‘è¡Œ"
 
-#: admin/systems/system-list.xml:209
-msgid "winStation"
-msgstr ""
-
-#: admin/systems/system-list.xml:217
-msgid "Network printer"
-msgstr "ç½‘ç»œæ‰“å°æœº"
-
-#: admin/systems/system-list.xml:241
-msgid "Mobile Phone"
-msgstr ""
-
-#: admin/systems/system-list.xml:253
+#: admin/systems/system-list.xml:100
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:260
+#: admin/systems/system-list.xml:107
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:303
+#: admin/systems/system-list.xml:147
+msgid "New object from template"
+msgstr ""
+
+#: admin/systems/system-list.xml:159
 msgid "Edit system"
 msgstr ""
 
-#: admin/systems/system-list.xml:316
+#: admin/systems/system-list.xml:173
 msgid "Remove system"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:37
+#: admin/systems/class_phoneGeneric.inc:33
 msgid "Phone information"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:41
+#: admin/systems/class_phoneGeneric.inc:37
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:59
+#: admin/systems/class_phoneGeneric.inc:55
 msgid "The name of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:63
+#: admin/systems/class_phoneGeneric.inc:59
 msgid "A short description of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:73
+#: admin/systems/class_phoneGeneric.inc:69
 msgid "The serial number of the phone"
 msgstr ""
 
-#: admin/systems/class_phoneGeneric.inc:77
+#: admin/systems/class_phoneGeneric.inc:73
 msgid "The telephone number of the phone"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:44
+msgid "Systems Management"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:138
+#: admin/systems/class_systemManagement.inc:152
 msgid "Action canceled"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:159
+#: admin/systems/class_systemManagement.inc:138
 #, php-format
 msgid "System %s has no mac address defined, cannot trigger action"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:173
+#: admin/systems/class_systemManagement.inc:152
 #, php-format
 msgid "System %s is currently installing"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:192
-msgid "Action triggered"
-msgstr ""
-
-#: admin/systems/class_systemManagement.inc:192
-#, php-format
-msgid "Action called without error (result was \"%s\")"
+#: admin/systems/class_systemManagement.inc:168
+#: admin/systems/class_systemManagement.inc:195
+msgid "Infrastructure service"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:250
-#: admin/systems/class_systemManagement.inc:326
-#: admin/systems/class_systemManagement.inc:420
-#: admin/systems/class_systemManagement.inc:483
-msgid "Permission"
-msgstr "å…è®¸"
-
-#: admin/systems/class_systemManagement.inc:420
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
+#: admin/systems/class_systemManagement.inc:171
+msgid "Action triggered"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:483
+#: admin/systems/class_systemManagement.inc:171
 #, php-format
-msgid "You are not allowed to restore a snapshot for %s."
+msgid "Action called without error (result was \"%s\")"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:649
+#: admin/systems/class_systemManagement.inc:263
 #, php-format
 msgid "Inherited from %s"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:701
-msgid "Systems Management"
-msgstr ""
+#: admin/systems/class_printGeneric.inc:30
+#: admin/systems/class_printGeneric.inc:35
+#: admin/systems/class_printGeneric.inc:36
+msgid "Printer"
+msgstr "æ‰“å°æœº"
 
 #: admin/systems/class_printGeneric.inc:31
 msgid "Printer information"
@@ -1044,18 +919,6 @@ msgstr "å…è®¸ä½¿ç”¨è¯¥æ‰“å°æœºçš„ç”¨æˆ·"
 msgid "Users which are allowed to administrate this printer"
 msgstr "å…è®¸ç®¡ç†è¯¥æ‰“å°æœºçš„ç”¨æˆ·"
 
-#: admin/systems/class_printGeneric.inc:108
-msgid "IP address this system uses"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address"
-msgstr ""
-
-#: admin/systems/class_printGeneric.inc:113
-msgid "Mac address of this system"
-msgstr ""
-
 #: admin/systems/class_printGeneric.inc:119
 msgid "Windows paths"
 msgstr ""
@@ -1084,14 +947,20 @@ msgstr ""
 msgid "Windows name of the printer driver"
 msgstr ""
 
-#: admin/systems/class_terminalGeneric.inc:33
-msgid "Terminal information"
-msgstr ""
-
-#: admin/systems/class_terminalGeneric.inc:55
+#: admin/systems/class_terminalGeneric.inc:31
 msgid "terminal"
 msgstr "ç»ˆç«¯"
 
+#: admin/systems/class_terminalGeneric.inc:43
+#: admin/systems/class_terminalGeneric.inc:48
+#: admin/systems/class_terminalGeneric.inc:49
+msgid "Terminal"
+msgstr "ç»ˆç«¯"
+
+#: admin/systems/class_terminalGeneric.inc:44
+msgid "Terminal information"
+msgstr ""
+
 #: addons/dashboard/systems_stats.tpl.c:2
 msgid "There are several argonaut servers! (this is not yet supported)"
 msgstr ""
@@ -1118,107 +987,13 @@ msgid_plural ""
 "argonaut server configured!"
 msgstr[0] ""
 
-#: admin/ogroups/goto/termgroup.tpl.c:5
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr "æ‚¨è¿™é‡Œé€‰æ‹©çš„åŠ¨ä½œä¼šå½±å“è¿™ä¸ªå¯¹è±¡ç»„å†…æ‰€æœ‰ç³»ç»Ÿã€‚è€Œä¸”ï¼Œæ‰€æœ‰è¿™é‡Œå¯ä»¥ä¿®æ”¹çš„å€¼éƒ½å¯ä»¥è¢«åˆ†é…åˆ°è¯¥å¯¹è±¡ç»„çš„å¯¹è±¡ç»§æ‰¿ã€‚"
-
-#: admin/ogroups/goto/termgroup.tpl.c:8
-msgid "Generic"
-msgstr "é€šç”¨é…ç½®"
-
-#: admin/ogroups/goto/termgroup.tpl.c:14
-msgid "Select terminal mode"
-msgstr "é€‰æ‹©ç»ˆç«¯ç±»åž‹"
-
-#: admin/ogroups/goto/termgroup.tpl.c:20
-msgid "Select NFS root filesystem to use"
-msgstr "é€‰æ‹©è¦ç”¨çš„ NFS æ ¹æ–‡ä»¶ç³»ç»Ÿã€‚"
-
-#: admin/ogroups/goto/termgroup.tpl.c:26
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "é€‰æ‹©æ”¾ç½®äº¤æ¢æ–‡ä»¶çš„ NFS æ–‡ä»¶ç³»ç»Ÿ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:29
-msgid "Action"
-msgstr "è¡ŒåŠ¨"
-
-#: admin/ogroups/goto/termgroup.tpl.c:32
-msgid "Select action to execute for this terminal"
-msgstr "é€‰æ‹©è¿™ä¸ªç»ˆç«¯è¦æ‰§è¡Œçš„åŠ¨ä½œ"
-
-#: admin/ogroups/goto/termgroup.tpl.c:35
-msgid "Execute"
-msgstr "æ‰§è¡Œ"
-
 #: admin/systems/serverService-list.tpl.c:2
 msgid "Base"
 msgstr "ä½ç½®"
 
-#: admin/systems/remove.tpl.c:5
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for"
-" this user. Please double check if your really want to do this since there "
-"is no way for FusionDirectory to get your data back."
-msgstr ""
-
-#: admin/systems/remove.tpl.c:8
-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 "è¿‡æ»¤å™¨"
-
-#: admin/systems/system-filter.tpl.c:5
-msgid "Show servers"
-msgstr "æ˜¾ç¤ºæœåŠ¡å™¨"
-
-#: admin/systems/system-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "æ˜¾ç¤ºå·¥ä½œç«™"
-
-#: admin/systems/system-filter.tpl.c:11
-msgid "Show terminals"
-msgstr "æ˜¾ç¤ºç»ˆç«¯"
-
-#: admin/systems/system-filter.tpl.c:14
-msgid "Show network printer"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:17
-msgid "Show phones"
-msgstr "æ˜¾ç¤ºç”µè¯"
-
-#: admin/systems/system-filter.tpl.c:20
-msgid "Show windows based workstations"
-msgstr ""
-
-#: admin/systems/system-filter.tpl.c:23
-msgid "Show network devices"
-msgstr "æ˜¾ç¤ºç½‘ç»œè®¾å¤‡"
-
-#: admin/systems/system-filter.tpl.c:26
-msgid "Show mobile phones"
-msgstr ""
-
-#: admin/systems/network.tpl.c:2
-msgid "IP-address"
-msgstr "IP åœ°å€"
-
-#: admin/systems/network.tpl.c:5
-msgid "Propose ip"
-msgstr ""
-
-#: admin/systems/network.tpl.c:8
-msgid "MAC-address"
-msgstr "MAC åœ°å€"
diff --git a/user-reminder/html/class_expiredUserPostpone.inc b/user-reminder/html/class_expiredUserPostpone.inc
index a6d1da2a7356c806067dc5196fe35d5523f4d905..01e26375772da8cb9edea50f8f6ab220ef000aab 100644
--- a/user-reminder/html/class_expiredUserPostpone.inc
+++ b/user-reminder/html/class_expiredUserPostpone.inc
@@ -46,7 +46,7 @@ class expiredUserPostpone extends standAlonePage
     }
 
     if (($_SERVER['REQUEST_METHOD'] == 'GET') && isset($_GET['token'])) {
-      /* Check if the token match */
+      // Check if the token match
       $this->uid = $_GET['uid'];
       if ($this->checkToken($_GET['token'])) {
         $this->message = array();
@@ -122,7 +122,7 @@ class expiredUserPostpone extends standAlonePage
 
     $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->rmdir($dn);
     if (!$ldap->success()) {
       $this->message[] = $ldap->get_error();
@@ -132,7 +132,6 @@ class expiredUserPostpone extends standAlonePage
   function postponeExpiration()
   {
     global $config;
-
     $dn = $this->getUserDn();
     if (empty($dn)) {
       return;
@@ -141,17 +140,22 @@ class expiredUserPostpone extends standAlonePage
     $date = $userTabs->by_object['posixAccount']->attributesAccess['shadowExpire']->getDateValue();
     $date->add(new DateInterval('P'.$this->postpone_days.'D'));
     $userTabs->by_object['posixAccount']->shadowExpire = $date;
-    $error = $userTabs->check();
+    $error = $userTabs->save();
     if (!empty($error)) {
       $this->message = $error;
       return;
     }
-    $userTabs->save();
     $this->deleteToken();
 
     $cn             = $userTabs->getBaseObject()->cn;
     $manager_dn     = $userTabs->getBaseObject()->manager;
-    $email_address  = $userTabs->by_object['mailAccount']->mail;
+    if (isset($userTabs->by_object['mailAccount'])) {
+      $email_address  = $userTabs->by_object['mailAccount']->mail;
+    } elseif (isset($userTabs->by_object['personalInfo']) && !empty($userTabs->by_object['personalInfo']->fdPrivateMail)) {
+      $email_address  = $userTabs->by_object['personalInfo']->fdPrivateMail;
+    } elseif (isset($userTabs->by_object['supannAccount']) && !empty($userTabs->by_object['supannAccount']->supannAutreMail)) {
+      $email_address  = reset($userTabs->by_object['supannAccount']->supannAutreMail);
+    }
 
     $manager_mail = '';
     if ($this->forward_postpone) {
@@ -174,8 +178,6 @@ class expiredUserPostpone extends standAlonePage
 
   function sendConfirmationMail($cn, $email_address, $manager_mail)
   {
-    global $config;
-
     if (empty($this->mail_body) || empty($this->mail_subject)) {
       return;
     }
@@ -198,8 +200,6 @@ class expiredUserPostpone extends standAlonePage
 
   function getUserDn()
   {
-    global $config;
-
     $users = objects::ls('user', NULL, NULL, '(uid='.$this->uid.')');
 
     if (count($users) < 1) {
diff --git a/user-reminder/locale/ar/fusiondirectory.po b/user-reminder/locale/ar/fusiondirectory.po
index 9e0f680c70244e43c27a7c0b5211e3260fe581f5..e5c5677153f04a67607031517ec11da8e2b35c28 100644
--- a/user-reminder/locale/ar/fusiondirectory.po
+++ b/user-reminder/locale/ar/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/ca/fusiondirectory.po b/user-reminder/locale/ca/fusiondirectory.po
index 7c69fa11eec9dd4c0dc4c414c862529a2c35728e..5cc0b7127e67ff1c9e090e9f57e05748c74a0788 100644
--- a/user-reminder/locale/ca/fusiondirectory.po
+++ b/user-reminder/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/cs_CZ/fusiondirectory.po b/user-reminder/locale/cs_CZ/fusiondirectory.po
index 82a5463d3a46df8860e392e2fa317b4557cee018..192dc82f1f7365103c63a1014c32fd823d4ddfe5 100644
--- a/user-reminder/locale/cs_CZ/fusiondirectory.po
+++ b/user-reminder/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,7 +73,7 @@ msgstr ""
 #: config/user-reminder/class_userReminderConfig.inc:73
 #: config/user-reminder/class_userReminderConfig.inc:99
 msgid "Subject"
-msgstr "PÅ™edmÄ›t"
+msgstr "pÅ™edmÄ›t"
 
 #: config/user-reminder/class_userReminderConfig.inc:73
 msgid "Subject of the alert email"
@@ -145,9 +146,11 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "tato poukÃ¡zka (token) je neplatnÃ¡"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Nastal problÃ©m s poÅ¡tovnÃm serverem â€“ obraÅ¥te se na svÃ©ho sprÃ¡vce systÃ©mÅ¯."
+msgstr ""
+"Nastal problÃ©m s poÅ¡tovnÃm serverem â€“ obraÅ¥te se prosÃm na svÃ©ho sprÃ¡vce "
+"systÃ©mÅ¯."
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
@@ -162,7 +165,7 @@ msgstr "Bylo nalezeno hned nÄ›kolik ÃºÄtÅ¯ s uÅ¾ivatelskÃ½m jmÃ©nem %s"
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
-msgstr "UÅ¾ivatel"
+msgstr "uÅ¾ivatel"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:8
 msgid "Expiration postpone"
@@ -171,7 +174,7 @@ msgstr ""
 #: ihtml/themes/breezy/user-reminder.tpl.c:11
 #: ihtml/themes/breezy/user-reminder.tpl.c:14
 msgid "Success"
-msgstr "ÃšspÄ›ch"
+msgstr "ÃºspÄ›ch"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:17
 msgid "Your expiration has been postponed successfully."
@@ -180,7 +183,7 @@ msgstr ""
 #: ihtml/themes/breezy/user-reminder.tpl.c:20
 #: ihtml/themes/breezy/user-reminder.tpl.c:23
 msgid "Error"
-msgstr "Chyba"
+msgstr "chyba"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:26
 msgid "There was a problem"
diff --git a/user-reminder/locale/de/fusiondirectory.po b/user-reminder/locale/de/fusiondirectory.po
index d26370b858f16c0cc2e883b941a056a0b395197d..800aa087472a7956dbfc6457f81a5d8e6b9a85a6 100644
--- a/user-reminder/locale/de/fusiondirectory.po
+++ b/user-reminder/locale/de/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-02-04 12:39+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,10 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gÃ¼ltig"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
+msgstr ""
+"Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/el_GR/fusiondirectory.po b/user-reminder/locale/el_GR/fusiondirectory.po
index c14c159053244ec3d5a92a41a61b24ebd4ed96e8..47511da3b406c829722abf1bb3d3a4e92b4cb056 100644
--- a/user-reminder/locale/el_GR/fusiondirectory.po
+++ b/user-reminder/locale/el_GR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/en/fusiondirectory.po b/user-reminder/locale/en/fusiondirectory.po
index d032f36e33700debf04a60bdd3321086f99aa047..16514e4018358ba1b2cd4d43ca14c3292f65a7a3 100644
--- a/user-reminder/locale/en/fusiondirectory.po
+++ b/user-reminder/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/es/fusiondirectory.po b/user-reminder/locale/es/fusiondirectory.po
index 2b627b2c2c4befc1c814d8c6fbc09624380ef4a4..a337ea65000b64ff2f8c2db77207e3a3518bebca 100644
--- a/user-reminder/locale/es/fusiondirectory.po
+++ b/user-reminder/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,10 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/es_CO/fusiondirectory.po b/user-reminder/locale/es_CO/fusiondirectory.po
index 3bdaacc2d2e23e7390701491c414bffd3ecb69cc..c7df23cf18c400a71c4e90366ef3a9c6141235dc 100644
--- a/user-reminder/locale/es_CO/fusiondirectory.po
+++ b/user-reminder/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,10 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "Este token es invÃ¡lido"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo."
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/es_VE/fusiondirectory.po b/user-reminder/locale/es_VE/fusiondirectory.po
index f2789f956ded43b4d626d3f6a419275265360e95..dea745c9b6a8b0d44843bdfa0ea7176d533a7ad9 100644
--- a/user-reminder/locale/es_VE/fusiondirectory.po
+++ b/user-reminder/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,10 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr ""
+"Contacte a su administrador, hubo un problema con el servidor de correo"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/fa_IR/fusiondirectory.po b/user-reminder/locale/fa_IR/fusiondirectory.po
index 2adacc986c4877bcbbde71becf483834165e7fec..4b164a27f8dd0dc5a8b9caa247b476b83152a8f9 100644
--- a/user-reminder/locale/fa_IR/fusiondirectory.po
+++ b/user-reminder/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/fi_FI/fusiondirectory.po b/user-reminder/locale/fi_FI/fusiondirectory.po
index 56abab88199a28d88ce5cc26c7e9c7d15ded0ae8..a5b966e912b049184e594762584879f4d2c80f66 100644
--- a/user-reminder/locale/fi_FI/fusiondirectory.po
+++ b/user-reminder/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/fr/fusiondirectory.po b/user-reminder/locale/fr/fusiondirectory.po
index bc1c9c21d9da0300891bb642131a7127ad30365f..ac73dbb79e0b4f8ddd4a49e55d79da3c47d28ea9 100644
--- a/user-reminder/locale/fr/fusiondirectory.po
+++ b/user-reminder/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -93,7 +93,9 @@ msgstr "Corps du message (les %s sont cn et  l'identifiant, et le lien)"
 msgid ""
 "Body of the alert email, sent when the user is about to expire. Use %s for "
 "the cn, uid and token."
-msgstr "Corps de l'alerte e-mail, envoyÃ© lorsque l'utilisateur est sur le point d'expirer. Utilisez %s pour le cn, uid et jeton."
+msgstr ""
+"Corps de l'alerte e-mail, envoyÃ© lorsque l'utilisateur est sur le point "
+"d'expirer. Utilisez %s pour le cn, uid et jeton."
 
 #: config/user-reminder/class_userReminderConfig.inc:81
 #, php-format
@@ -101,7 +103,12 @@ msgid ""
 "Dear %1$s,\n"
 "your account %2$s is about to expire, please use this link to avoid this: \n"
 "https://"
-msgstr "Cher %1$s,\n \nvotre compte %2$s est sur le point d'expirer, veuillez utiliser ce lien pour Ã©viter cela: \n\nhttps: //"
+msgstr ""
+"Cher %1$s,\n"
+" \n"
+"votre compte %2$s est sur le point d'expirer, veuillez utiliser ce lien pour Ã©viter cela: \n"
+"\n"
+"https: //"
 
 #: config/user-reminder/class_userReminderConfig.inc:91
 msgid "Confirmation email settings"
@@ -133,22 +140,30 @@ msgstr "Corps du message (les %s sont cn et  l'identifiant )"
 msgid ""
 "Body of the confirmation email, sent when the user has postponed expiration."
 " Use %s for the cn and uid."
-msgstr "Corps de l'alerte e-mail, envoyÃ© lorsque le compte de l'utilisateur a Ã©tÃ© prolongÃ©. Utilisez %s pour le cn et uid."
+msgstr ""
+"Corps de l'alerte e-mail, envoyÃ© lorsque le compte de l'utilisateur a Ã©tÃ© "
+"prolongÃ©. Utilisez %s pour le cn et uid."
 
 #: config/user-reminder/class_userReminderConfig.inc:107
 #, php-format
 msgid ""
 "Dear %1$s,\n"
 " your account %2$s expiration has been successfully postponed.\n"
-msgstr "Cher %1$s,\n\nl'expiration de votre compte %2$s a Ã©tÃ© prolongÃ© avec succÃ¨s.\n\n"
+msgstr ""
+"Cher %1$s,\n"
+"\n"
+"l'expiration de votre compte %2$s a Ã©tÃ© prolongÃ© avec succÃ¨s.\n"
+"\n"
 
 #: html/class_expiredUserPostpone.inc:58
 msgid "This token is invalid"
 msgstr "Le jeton n'est pas valide"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contactez votre administrateur systÃ¨me, il y a eu un problÃ¨me avec le serveur de courriel"
+msgstr ""
+"Contactez votre administrateur systÃ¨me, il y a eu un problÃ¨me avec l'envoi "
+"du message"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
@@ -172,7 +187,7 @@ msgstr "Prolongation du compte"
 #: ihtml/themes/breezy/user-reminder.tpl.c:11
 #: ihtml/themes/breezy/user-reminder.tpl.c:14
 msgid "Success"
-msgstr "SuccÃ¨s"
+msgstr "RÃ©ussi"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:17
 msgid "Your expiration has been postponed successfully."
diff --git a/user-reminder/locale/hu_HU/fusiondirectory.po b/user-reminder/locale/hu_HU/fusiondirectory.po
index f6487f88ffdffc9671f5dc427af9c59323a0b62e..6ac24dc595c9bf024b328d0bdb4c53ab8ac98506 100644
--- a/user-reminder/locale/hu_HU/fusiondirectory.po
+++ b/user-reminder/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/id/fusiondirectory.po b/user-reminder/locale/id/fusiondirectory.po
index a2cf9d4613fc7121e43eb3a55cfd2b5d154be9e8..ae9e7c6ef93539bc698472bd555e7cd58e9ed86e 100644
--- a/user-reminder/locale/id/fusiondirectory.po
+++ b/user-reminder/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/it_IT/fusiondirectory.po b/user-reminder/locale/it_IT/fusiondirectory.po
index 043c3cd13c361f771fe8b7644afeaf7dffb15fb0..23c30c4d4a1f83e56949b624ac1805b94a7560f3 100644
--- a/user-reminder/locale/it_IT/fusiondirectory.po
+++ b/user-reminder/locale/it_IT/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2016
-# Paola Penati <paola.penati@opensides.be>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2016-09-02 14:39+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -94,7 +93,9 @@ msgstr "Corpo del messaggio (%s sono cn, login e link token)"
 msgid ""
 "Body of the alert email, sent when the user is about to expire. Use %s for "
 "the cn, uid and token."
-msgstr "Corpo del messaggio dell'e-mail di notifica inviato quando l'utente sta per scadere. Usare %s per il cn, uid e token."
+msgstr ""
+"Corpo del messaggio dell'e-mail di notifica inviato quando l'utente sta per "
+"scadere. Usare %s per il cn, uid e token."
 
 #: config/user-reminder/class_userReminderConfig.inc:81
 #, php-format
@@ -102,7 +103,10 @@ msgid ""
 "Dear %1$s,\n"
 "your account %2$s is about to expire, please use this link to avoid this: \n"
 "https://"
-msgstr "Caro %1$s,\nil tuo account %2$s sta per scadere, si prega di utilizzare questo link per evitare questo: \nhttps://"
+msgstr ""
+"Caro %1$s,\n"
+"il tuo account %2$s sta per scadere, si prega di utilizzare questo link per evitare questo: \n"
+"https://"
 
 #: config/user-reminder/class_userReminderConfig.inc:91
 msgid "Confirmation email settings"
@@ -122,7 +126,8 @@ msgstr "Oggetto dell'e-mail di conferma"
 
 #: config/user-reminder/class_userReminderConfig.inc:101
 msgid "[FusionDirectory] Your account expiration has been postponed"
-msgstr "[FusionDirectory] La data di scadenza del tuo account Ã© stata rinviata"
+msgstr ""
+"[FusionDirectory] La data di scadenza del tuo account Ã© stata rinviata"
 
 #: config/user-reminder/class_userReminderConfig.inc:104
 #, php-format
@@ -134,22 +139,28 @@ msgstr "Corpo del messaggio (%s sono cn e login)"
 msgid ""
 "Body of the confirmation email, sent when the user has postponed expiration."
 " Use %s for the cn and uid."
-msgstr "Corpo del messaggio di conferma, inviato quando l'utente ha rinviato la scadenza. Usare %s per il CN e UID."
+msgstr ""
+"Corpo del messaggio di conferma, inviato quando l'utente ha rinviato la "
+"scadenza. Usare %s per il CN e UID."
 
 #: config/user-reminder/class_userReminderConfig.inc:107
 #, php-format
 msgid ""
 "Dear %1$s,\n"
 " your account %2$s expiration has been successfully postponed.\n"
-msgstr "Caro %1$s,\nla data di scadenza del tuo acccount %2$s Ã© stata rinviata con successo.\n"
+msgstr ""
+"Caro %1$s,\n"
+"la data di scadenza del tuo acccount %2$s Ã© stata rinviata con successo.\n"
 
 #: html/class_expiredUserPostpone.inc:58
 msgid "This token is invalid"
 msgstr "Questo token non Ã¨ valido"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Contattare l'amministratore, c'Ã¨ stato un problema con il server di posta elettronica"
+msgstr ""
+"Contattare l'amministratore, c'Ã¨ stato un problema con il server di posta "
+"elettronica"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/lv/fusiondirectory.po b/user-reminder/locale/lv/fusiondirectory.po
index 5b15cc6bdc13b233682f819e6854512648998de1..8c08eba335bdbe307499cee5b4d523c55522a6a1 100644
--- a/user-reminder/locale/lv/fusiondirectory.po
+++ b/user-reminder/locale/lv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/nb/fusiondirectory.po b/user-reminder/locale/nb/fusiondirectory.po
index d82402465b7cbe3cf30340d103bfdc3454da647c..83d6e5fd284e87681723a12ec30c067a4b335a1f 100644
--- a/user-reminder/locale/nb/fusiondirectory.po
+++ b/user-reminder/locale/nb/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/nl/fusiondirectory.po b/user-reminder/locale/nl/fusiondirectory.po
index a7d22b5b0faa37c5c29d7f71438ccd0da1487fdd..9aa257a9d783484a9c118d5617f925ca2d7902b3 100644
--- a/user-reminder/locale/nl/fusiondirectory.po
+++ b/user-reminder/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,17 @@ msgstr ""
 
 #: config/user-reminder/class_userReminderConfig.inc:28
 msgid "User reminder"
-msgstr ""
+msgstr "Gebruikersherinnering"
 
 #: config/user-reminder/class_userReminderConfig.inc:29
 msgid "Configuration for the reminder of accounts expiration"
 msgstr ""
+"Configuratie om de gebruiker te laten herinneren dat het account gaat "
+"verlopen"
 
 #: config/user-reminder/class_userReminderConfig.inc:40
 msgid "User reminder settings"
-msgstr ""
+msgstr "Instellingen voor de gebruikersherinnering"
 
 #: config/user-reminder/class_userReminderConfig.inc:43
 msgid "Delay before expiration"
@@ -145,19 +148,19 @@ msgstr ""
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
 msgid "Did not find an account with login \"%s\""
-msgstr ""
+msgstr "Kan geen account vinden met login \"%s\""
 
 #: html/class_expiredUserPostpone.inc:209
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
-msgstr ""
+msgstr "Er zijn meerdere accounts gevonden met login \"%s\""
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
@@ -184,4 +187,4 @@ msgstr "Fout"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:26
 msgid "There was a problem"
-msgstr ""
+msgstr "Er was een probleem"
diff --git a/user-reminder/locale/pl/fusiondirectory.po b/user-reminder/locale/pl/fusiondirectory.po
index f3b0abd66b9d194cb5f1dd653dbae75420f544f0..2e0feb0db2583c8e1a92814e64ad0207d41013f1 100644
--- a/user-reminder/locale/pl/fusiondirectory.po
+++ b/user-reminder/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/pt/fusiondirectory.po b/user-reminder/locale/pt/fusiondirectory.po
index 038b36f597cc7df86d65bd360af6f4e4b80fc2d8..031bb043870a840f52fcaf78bdb053459b409078 100644
--- a/user-reminder/locale/pt/fusiondirectory.po
+++ b/user-reminder/locale/pt/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/pt_BR/fusiondirectory.po b/user-reminder/locale/pt_BR/fusiondirectory.po
index 0625f9ec3a4b461a52c3dcdb649795ba9506ab02..45dbb715cfc64285e24c1e713354723433c83c5e 100644
--- a/user-reminder/locale/pt_BR/fusiondirectory.po
+++ b/user-reminder/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,11 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Entre em contato com o administrador, houve um problema com o servidor de e-mail."
+msgstr ""
+"Entre em contato com o administrador, houve um problema com o servidor de "
+"e-mail."
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
diff --git a/user-reminder/locale/ru/fusiondirectory.po b/user-reminder/locale/ru/fusiondirectory.po
index 2bc2c3544c86a25f8de1587070f84dc3c3f7a542..1fdd8349f2605e6f362ee312b30b188916aac25e 100644
--- a/user-reminder/locale/ru/fusiondirectory.po
+++ b/user-reminder/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,9 +146,11 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr "Ð¡Ð²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼, Ð±Ñ‹Ð»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
+msgstr ""
+"Ð¡Ð²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼, Ð±Ñ‹Ð»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ "
+"ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
 
 #: html/class_expiredUserPostpone.inc:206
 #, php-format
@@ -162,7 +165,7 @@ msgstr "ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ Ð¼Ð½Ð¾Ð¶ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡ÐµÑ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ñ Ð»Ð¾
 #: ihtml/themes/breezy/user-reminder.tpl.c:2
 #: ihtml/themes/breezy/user-reminder.tpl.c:5
 msgid "User"
-msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
+msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ"
 
 #: ihtml/themes/breezy/user-reminder.tpl.c:8
 msgid "Expiration postpone"
diff --git a/user-reminder/locale/ru@petr1708/fusiondirectory.po b/user-reminder/locale/ru@petr1708/fusiondirectory.po
index 0237adfa3ede3a2869839419021b5bf325f96d04..817ec9c0e81109c1600ae6de66d9af06a93eacde 100644
--- a/user-reminder/locale/ru@petr1708/fusiondirectory.po
+++ b/user-reminder/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/sv/fusiondirectory.po b/user-reminder/locale/sv/fusiondirectory.po
index 3f42079de38ce98fee07f838faaa0dd8c752e454..87e7093de68d44b679cb44f18b200e57378a45a4 100644
--- a/user-reminder/locale/sv/fusiondirectory.po
+++ b/user-reminder/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Kontakta din administratÃ¶r, det uppstod ett problem med epostservern"
 
diff --git a/user-reminder/locale/ug/fusiondirectory.po b/user-reminder/locale/ug/fusiondirectory.po
index af37d115f32c4dead1a90512229e3fcf5d22908a..b8766fa4d079634023ce6e7d430f88019fa74065 100644
--- a/user-reminder/locale/ug/fusiondirectory.po
+++ b/user-reminder/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/vi_VN/fusiondirectory.po b/user-reminder/locale/vi_VN/fusiondirectory.po
index a421c4e5e36081ac7e2315844b89f05c1fdf46ec..bd0d322ebf1c4b4ab7e7038d2a3d466dcf0d5555 100644
--- a/user-reminder/locale/vi_VN/fusiondirectory.po
+++ b/user-reminder/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/user-reminder/locale/zh/fusiondirectory.po b/user-reminder/locale/zh/fusiondirectory.po
index 76fbc4160e352e1955a8b5409b5f3ff8be14bf9c..658ebc31b9680d86892ec4ec58dcf5ac25ceabbf 100644
--- a/user-reminder/locale/zh/fusiondirectory.po
+++ b/user-reminder/locale/zh/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,7 +146,7 @@ msgstr ""
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_expiredUserPostpone.inc:195
+#: html/class_expiredUserPostpone.inc:197
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
diff --git a/weblink/admin/systems/weblink/class_webLink.inc b/weblink/admin/systems/weblink/class_webLink.inc
index d188463c34189e40d4ff421006c7dba3fbdf5485..9ccbfa0f5c4acb3409e373a635c98e6ef6ad292e 100644
--- a/weblink/admin/systems/weblink/class_webLink.inc
+++ b/weblink/admin/systems/weblink/class_webLink.inc
@@ -49,7 +49,7 @@ class webLink extends simplePlugin
             array('https', 'http')
           ),
           new DisplayAttribute (
-            _('Link'), _('Web link to this computer'),
+            _('Links'), _('Web links to this computer'),
             'fdWebLink', FALSE
           )
         )
@@ -66,26 +66,47 @@ class webLink extends simplePlugin
 
   function renderAttributes($readOnly = FALSE)
   {
-    $link = $this->computeLink();
-    $this->fdWebLink = '<a target="_blank" href="'.$link.'">'.$link.'</a>';
+    $links = $this->computeLinks();
+    $this->fdWebLink = implode('<br/>'."\n", array_map(
+      function ($link)
+      {
+        return '<a target="_blank" href="'.$link.'">'.$link.'</a>';
+      },
+      $links
+    ));
     return parent::renderAttributes($readOnly);
   }
 
-  function computeLink()
+  function computeLinks()
   {
+    global $config;
     if ($this->member_of_group) {
       $protocol = $this->group_attrs['fdWebLinkProtocol'][0];
     } else {
       $protocol = $this->fdWebLinkProtocol;
     }
-    $basetab = $this->parent->getBaseObject();
-    if ($basetab->netConfigDNS->DNS_is_account) {
-      $zone = strrchr($basetab->netConfigDNS->dnsEntry['zoneName'], '/');
-      $host = $basetab->cn.'.'.preg_replace(array('/^\//', '/.$/'), '', $zone);
-    } else {
-      $host = $basetab->netConfigDNS->ipHostNumber;
+    $basetab  = $this->parent->getBaseObject();
+    $hosts    = $basetab->ipHostNumber;
+    if (!is_array($hosts)) {
+      $hosts = array($hosts);
+    }
+    if (isset($this->parent->by_object['dnsHost']) && ($this->parent->by_object['dnsHost']->is_account)) {
+      $zones  = $this->parent->by_object['dnsHost']->fdDNSZoneDn;
+      $ldap   = $config->get_ldap_link();
+      foreach ($zones as $zoneDn) {
+        $ldap->cat($zoneDn);
+        if ($attrs = $ldap->fetch()) {
+          $hosts[] = $basetab->cn.'.'.preg_replace('/\.$/', '', $attrs['zoneName'][0]);
+        }
+      }
     }
-    return $protocol.'://'.$host;
+    return array_map(
+      function ($host) use ($protocol)
+      {
+        return $protocol.'://'.$host;
+      },
+      $hosts
+    );
   }
 }
 
diff --git a/weblink/locale/ar/fusiondirectory.po b/weblink/locale/ar/fusiondirectory.po
index c59378206fe5550d12cfdbc4b5b91240b6abcb64..2bb88330c3f43a4d54a53db87f10d3904ce9c37b 100644
--- a/weblink/locale/ar/fusiondirectory.po
+++ b/weblink/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Ø±Ø§Ø¨Ø·"
+msgid "Links"
+msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/ca/fusiondirectory.po b/weblink/locale/ca/fusiondirectory.po
index 5b93415f6054790a38d0776e473be1f5202f20a3..2f55181ada5de55f80fbb3dbd38808a8b55ce0cc 100644
--- a/weblink/locale/ca/fusiondirectory.po
+++ b/weblink/locale/ca/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/cs_CZ/fusiondirectory.po b/weblink/locale/cs_CZ/fusiondirectory.po
index ca3237cde4640122a8165624fb39f75948a779cf..1e4126a2645c6e5add93947f6e1b982203a8f269 100644
--- a/weblink/locale/cs_CZ/fusiondirectory.po
+++ b/weblink/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr "Protokol pro pÅ™Ãstup k webovÃ© strÃ¡nce tohoto poÄÃtaÄe"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Odkaz"
+msgid "Links"
+msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "WebovÃ½ odkaz na tento poÄÃtaÄ"
+msgid "Web links to this computer"
+msgstr ""
diff --git a/weblink/locale/de/fusiondirectory.po b/weblink/locale/de/fusiondirectory.po
index 17007f45f0abab023241bd1eb7d12376bec99867..44629ed68b097e82675e08d98b9dd017e20671f8 100644
--- a/weblink/locale/de/fusiondirectory.po
+++ b/weblink/locale/de/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-# Maik Wagner <maikwagner@yahoo.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr "Zu verwendendes Protokoll fÃ¼r den Zugriff auf diese Computerwebseite"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Link"
+msgid "Links"
+msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "Weblink zu diesem Rechner"
+msgid "Web links to this computer"
+msgstr ""
diff --git a/weblink/locale/el_GR/fusiondirectory.po b/weblink/locale/el_GR/fusiondirectory.po
index 8d430d0d0792a959117eca0355a38e599499ed13..fc63acdbbb1eeda7e55a9de24a6821fbc7ecb9df 100644
--- a/weblink/locale/el_GR/fusiondirectory.po
+++ b/weblink/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Elissavet Botsaki <elisavet_b@hotmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,12 +33,14 @@ msgstr "Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol to use to access this computer Web page"
-msgstr "Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿ Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ ÏƒÏ„Î¿Î½ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î³Î¹Î± Ï„Î·Î½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· ÏƒÎµ Î¹ÏƒÏ„Î¿ÏƒÎµÎ»Î¯Î´Î±  "
+msgstr ""
+"Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿ Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ ÏƒÏ„Î¿Î½ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î® Î³Î¹Î± Ï„Î·Î½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·"
+" ÏƒÎµ Î¹ÏƒÏ„Î¿ÏƒÎµÎ»Î¯Î´Î±  "
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Î£ÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚"
+msgid "Links"
+msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "Î£ÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®"
+msgid "Web links to this computer"
+msgstr ""
diff --git a/weblink/locale/en/fusiondirectory.po b/weblink/locale/en/fusiondirectory.po
index 71137d00bdd665c1861b62c8b2b8deac23a535b3..b890098273701a8fdfdf823c9bd63ed088659899 100644
--- a/weblink/locale/en/fusiondirectory.po
+++ b/weblink/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/es/fusiondirectory.po b/weblink/locale/es/fusiondirectory.po
index 60d0fe96291af394a43975bb89a117bcf50f92b1..891dd3e0c5ddf10595590d6846693f27a6bf1b00 100644
--- a/weblink/locale/es/fusiondirectory.po
+++ b/weblink/locale/es/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/es_CO/fusiondirectory.po b/weblink/locale/es_CO/fusiondirectory.po
index 1d6e1f6be3dada5d84f65e908940b6a86ecacd6b..d84376afc797e1acc52a32502ea84baa99e0674c 100644
--- a/weblink/locale/es_CO/fusiondirectory.po
+++ b/weblink/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/es_VE/fusiondirectory.po b/weblink/locale/es_VE/fusiondirectory.po
index 61ee4a6f2f80734bf8050886ee4c7c2330f9b41a..ad7b5b126361c083c15c883489d382ef659ca790 100644
--- a/weblink/locale/es_VE/fusiondirectory.po
+++ b/weblink/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/fa_IR/fusiondirectory.po b/weblink/locale/fa_IR/fusiondirectory.po
index db040ec27f53b8967664c757f7650ac637ef4189..90d5eb1c83453d4390d5f5a19252786af4a9377e 100644
--- a/weblink/locale/fa_IR/fusiondirectory.po
+++ b/weblink/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/fi_FI/fusiondirectory.po b/weblink/locale/fi_FI/fusiondirectory.po
index 85cd59a5111b8da9c968a1b529196a5877a9748e..ac0b8888db12c3b6c0a4e04ba2a1d87f11e4a398 100644
--- a/weblink/locale/fi_FI/fusiondirectory.po
+++ b/weblink/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/fr/fusiondirectory.po b/weblink/locale/fr/fusiondirectory.po
index d10da4b8433aecef85b1404113058104f2abf033..95b9cead178628a9a302bbfb06f9060e68d82405 100644
--- a/weblink/locale/fr/fusiondirectory.po
+++ b/weblink/locale/fr/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgstr "Lien Web"
 
 #: admin/systems/weblink/class_webLink.inc:32
 msgid "Edit web link"
-msgstr "Ã‰diter le lien web"
+msgstr "Editer le lien web"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol"
@@ -33,12 +33,12 @@ msgstr "Protocole"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol to use to access this computer Web page"
-msgstr "Protocole Ã  utiliser pour accÃ©der Ã  la page Web de la machine"
+msgstr "Protocole Ã  utiliser pour accÃ©der Ã  cette page Web"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Lien"
+msgid "Links"
+msgstr "Liens"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "Lien Web vers cet ordinateur"
+msgid "Web links to this computer"
+msgstr "Liens Internet de cet ordinateur"
diff --git a/weblink/locale/hu_HU/fusiondirectory.po b/weblink/locale/hu_HU/fusiondirectory.po
index dd65f16f225c187d0babf8e95bcc6ccfbb9abb54..be35163deaabea0faccb8e28cd7d63de57700e1f 100644
--- a/weblink/locale/hu_HU/fusiondirectory.po
+++ b/weblink/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/id/fusiondirectory.po b/weblink/locale/id/fusiondirectory.po
index fc5a3ae13e8d7d70558476a898bd37e265600169..721ccf4600570dc3e2f10be1c0a00fb5a94d1275 100644
--- a/weblink/locale/id/fusiondirectory.po
+++ b/weblink/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/it_IT/fusiondirectory.po b/weblink/locale/it_IT/fusiondirectory.po
index 62dc135066d1986e53a4b11aa5f615d0aae8c7a6..72fea0e73a64effa5a61a26a098377cce068b64b 100644
--- a/weblink/locale/it_IT/fusiondirectory.po
+++ b/weblink/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr "Protocollo da usare per accedere alla pagina Web di questo computer"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Link"
+msgid "Links"
+msgstr "Links"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "Link verso la pagina web di questo computer"
+msgid "Web links to this computer"
+msgstr "Collegamenti Web a questo computer"
diff --git a/weblink/locale/lv/fusiondirectory.po b/weblink/locale/lv/fusiondirectory.po
index 43bb5586a00e4c5e143f8dd76822d8baacc5e075..4583bca8e357a87a7679100839f30cab5422994e 100644
--- a/weblink/locale/lv/fusiondirectory.po
+++ b/weblink/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/nb/fusiondirectory.po b/weblink/locale/nb/fusiondirectory.po
index ce3ba90e3086679e3b8e28f20b7b89b533cc3d2a..7ddeedcef4da279db42a53b33147d80ab560cc5e 100644
--- a/weblink/locale/nb/fusiondirectory.po
+++ b/weblink/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/nl/fusiondirectory.po b/weblink/locale/nl/fusiondirectory.po
index 3d72cfe73a056a875a3538a3fcaca575b3857653..d137a7c479c5556caf541903ff60f91627e96a1a 100644
--- a/weblink/locale/nl/fusiondirectory.po
+++ b/weblink/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,24 +21,24 @@ msgstr ""
 #: admin/systems/weblink/class_webLink.inc:31
 #: admin/systems/weblink/class_webLink.inc:44
 msgid "Web link"
-msgstr ""
+msgstr "Web link"
 
 #: admin/systems/weblink/class_webLink.inc:32
 msgid "Edit web link"
-msgstr ""
+msgstr "Bewerk web link"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol"
-msgstr ""
+msgstr "Protocol"
 
 #: admin/systems/weblink/class_webLink.inc:47
 msgid "Protocol to use to access this computer Web page"
-msgstr ""
+msgstr "Protocol dat toegang geeft tot de computer web pagina"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr ""
+msgid "Links"
+msgstr "Links"
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr ""
+msgid "Web links to this computer"
+msgstr "Web links naar deze computer"
diff --git a/weblink/locale/pl/fusiondirectory.po b/weblink/locale/pl/fusiondirectory.po
index 514fcc0f044c4c7f43620d2509804e9f82a348b8..3fb952db67d3bed2e12d47174b4d07064b867c55 100644
--- a/weblink/locale/pl/fusiondirectory.po
+++ b/weblink/locale/pl/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/pt/fusiondirectory.po b/weblink/locale/pt/fusiondirectory.po
index 831d7bbe7d431ff398a12759ca5a287007320234..7cd1c2c75bf491a2871acc084044a7b7fdbbe44b 100644
--- a/weblink/locale/pt/fusiondirectory.po
+++ b/weblink/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/pt_BR/fusiondirectory.po b/weblink/locale/pt_BR/fusiondirectory.po
index 8cad4ce1f88896af961d2b30ade47c26fe6da143..b602704f12a5a3e71e4c4010a9d2da0e906569d0 100644
--- a/weblink/locale/pt_BR/fusiondirectory.po
+++ b/weblink/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
-msgstr "Link"
+msgid "Links"
+msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
-msgstr "Link da web para este computador"
+msgid "Web links to this computer"
+msgstr ""
diff --git a/weblink/locale/ru/fusiondirectory.po b/weblink/locale/ru/fusiondirectory.po
index ceaa151fbac26ec1fb138e4493ee08952a5cf15f..9cbc070d0636221a0791f23792186217dcfd4965 100644
--- a/weblink/locale/ru/fusiondirectory.po
+++ b/weblink/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +36,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/ru@petr1708/fusiondirectory.po b/weblink/locale/ru@petr1708/fusiondirectory.po
index ae315ea6192adb0fa344ff35bbb91b498fab64a3..a8e6c5ef3edcbddd1d5bb8747574055f4bd9a382 100644
--- a/weblink/locale/ru@petr1708/fusiondirectory.po
+++ b/weblink/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/sv/fusiondirectory.po b/weblink/locale/sv/fusiondirectory.po
index be7e594eba1ed6816709abc2c646fb701aaa50eb..149a672797d29abc21600141c47e08ec52d97301 100644
--- a/weblink/locale/sv/fusiondirectory.po
+++ b/weblink/locale/sv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/ug/fusiondirectory.po b/weblink/locale/ug/fusiondirectory.po
index b40777292f8fe52fa42a232292ece022364629b9..583d7ba94a95d480fff95dfe7b857dbf7f59ebb7 100644
--- a/weblink/locale/ug/fusiondirectory.po
+++ b/weblink/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/vi_VN/fusiondirectory.po b/weblink/locale/vi_VN/fusiondirectory.po
index 4e74f3c155a9c8bcb67b773449426d89ef5968dc..f83a1aca0ecfe9b5fd1ab1cb1394eaaac51aa73f 100644
--- a/weblink/locale/vi_VN/fusiondirectory.po
+++ b/weblink/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/weblink/locale/zh/fusiondirectory.po b/weblink/locale/zh/fusiondirectory.po
index 1d14651ab7454f6db29056cc305ca74c802d6daa..f9e99f15176789c6822511055905aa12640617a8 100644
--- a/weblink/locale/zh/fusiondirectory.po
+++ b/weblink/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,9 +35,9 @@ msgid "Protocol to use to access this computer Web page"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Link"
+msgid "Links"
 msgstr ""
 
 #: admin/systems/weblink/class_webLink.inc:52
-msgid "Web link to this computer"
+msgid "Web links to this computer"
 msgstr ""
diff --git a/webservice/contrib/docs/jsonrpc.php.doc b/webservice/contrib/docs/jsonrpc.php.doc
index 49793094e078d85cbac4575b75bc53e6d79bd5e0..7e363df35b98fc005b9d90c7b0df1350a8109852 100644
--- a/webservice/contrib/docs/jsonrpc.php.doc
+++ b/webservice/contrib/docs/jsonrpc.php.doc
@@ -39,6 +39,7 @@ class fdRPCService
    * \return The list of configured LDAP servers as an associative array (keys are ids, values are displayable names)
    */
   function listLdaps() {}
+
   /*!
    * \brief Login into the webservice
    *
@@ -50,6 +51,15 @@ class fdRPCService
    */
   function login($ldap, $user, $pwd) {}
 
+  /*!
+   * \brief Log out of the webservice
+   *
+   * \param string $sid the session id
+   *
+   * \return TRUE
+   */
+  function logout($sid) {}
+
   /*!
    * \brief Get list of object of objectType $type in $ou
    *
diff --git a/webservice/html/jsonrpc.php b/webservice/html/jsonrpc.php
index 1bf829bd4a566db21ddf652586b6b7f65d9f6164..6e5dd99d8e800348141d407a13e8c016d1ed1250 100644
--- a/webservice/html/jsonrpc.php
+++ b/webservice/html/jsonrpc.php
@@ -180,6 +180,15 @@ class fdRPCService
     }
   }
 
+  /*!
+   * \brief Log out
+   */
+  protected function _logout ()
+  {
+    session::destroy();
+    return TRUE;
+  }
+
   /*!
    * \brief Get list of object of objectType $type in $ou
    */
@@ -218,7 +227,6 @@ class fdRPCService
    */
   protected function _listTypes()
   {
-    global $config;
     $types  = objects::types();
 
     $result = array();
@@ -269,11 +277,10 @@ class fdRPCService
     }
     $_POST = array($tab.'_modify_state' => 1);
     $tabobject->save_object();
-    $errors = $tabobject->check();
+    $errors = $tabobject->save();
     if (!empty($errors)) {
       return array('errors' => $errors);
     }
-    $tabobject->save();
     return $tabobject->dn;
   }
 
@@ -298,7 +305,7 @@ class fdRPCService
       $fields = $object->attributesInfo;
       foreach ($fields as &$section) {
         $attributes = array();
-        foreach ($section['attrs'] as $key => $attr) {
+        foreach ($section['attrs'] as $attr) {
           if ($object->acl_is_readable($attr->getAcl())) {
             $attr->serializeAttribute($attributes, TRUE);
           }
@@ -353,11 +360,10 @@ class fdRPCService
       $_POST[$tab.'_modify_state'] = 1;
     }
     $tabobject->save_object();
-    $errors = $tabobject->check();
+    $errors = $tabobject->save();
     if (!empty($errors)) {
       return array('errors' => $errors);
     }
-    $tabobject->save();
     return $tabobject->dn;
   }
 
@@ -382,7 +388,7 @@ class fdRPCService
       $fields = $object->attributesInfo;
       foreach ($fields as &$section) {
         $attributes = array();
-        foreach ($section['attrs'] as $key => $attr) {
+        foreach ($section['attrs'] as $attr) {
           if ($object->acl_is_readable($attr->getAcl())) {
             $attr->serializeAttribute($attributes, FALSE);
           }
@@ -436,11 +442,10 @@ class fdRPCService
       $tabobject->current = $tab;
       $tabobject->save_object(); /* Should not do much as POST is empty, but in some cases is needed */
     }
-    $errors = $tabobject->check();
+    $errors = $tabobject->save();
     if (!empty($errors)) {
       return array('errors' => $errors);
     }
-    $tabobject->save();
     return $tabobject->dn;
   }
 
@@ -468,11 +473,10 @@ class fdRPCService
       return array('errors' => array($error));
     }
     $tabobject = $template->apply();
-    $errors = $tabobject->check();
+    $errors = $tabobject->save();
     if (!empty($errors)) {
       return array('errors' => $errors);
     }
-    $tabobject->save();
     return $tabobject->dn;
   }
 
@@ -483,7 +487,6 @@ class fdRPCService
   {
     global $ui;
     $infos = objects::infos($type);
-    $plist = session::global_get('plist');
     // Check permissions, are we allowed to remove this object?
     $acl = $ui->get_permissions($dn, $infos['aclCategory'].'/'.$infos['mainTab']);
     if (preg_match('/d/', $acl)) {
diff --git a/webservice/include/jsonrpcphp/jsonRPCServer.php b/webservice/include/jsonrpcphp/jsonRPCServer.php
index 2c0af25e9e26493dd0329165285ceb73beb7bf98..ac56eac63a45dbc6f8c238dfb0ac0bcc2791c4a0 100644
--- a/webservice/include/jsonrpcphp/jsonRPCServer.php
+++ b/webservice/include/jsonrpcphp/jsonRPCServer.php
@@ -1,6 +1,6 @@
 <?php
 /*
-          COPYRIGHT
+					COPYRIGHT
 
 Copyright 2007 Sergio Vaccaro <sergio@inservibile.org>
 Copyright 2013-2016 FusionDirectory
@@ -29,58 +29,59 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * @author sergio <jsonrpcphp@inservibile.org>
  */
 class jsonRPCServer {
-  /**
-   * This function handle a request binding it to a given object
-   *
-   * @param object $object
-   * @return boolean
-   */
-  public static function handle($object) {
+	/**
+	 * This function handle a request binding it to a given object
+	 *
+	 * @param object $object
+	 * @return boolean
+	 */
+	public static function handle($object) {
 
-    /* checks if a JSON-RCP request has been received */
-    if (
-      $_SERVER['REQUEST_METHOD'] != 'POST' ||
-      empty($_SERVER['CONTENT_TYPE']) ||
-      $_SERVER['CONTENT_TYPE'] != 'application/json'
-      ) {
-      /* This is not a JSON-RPC request */
-      return false;
-    }
+		// checks if a JSON-RCP request has been received
+		if (
+			$_SERVER['REQUEST_METHOD'] != 'POST' ||
+			empty($_SERVER['CONTENT_TYPE']) ||
+			$_SERVER['CONTENT_TYPE'] != 'application/json'
+			) {
+			// This is not a JSON-RPC request
+			return false;
+		}
 
-    /* reads the input data */
-    $request = json_decode(file_get_contents('php://input'),true);
+		// reads the input data
+		$request = json_decode(file_get_contents('php://input'),true);
 
-    /* executes the task on local object */
-    try {
-      if (($result = @call_user_func_array(array($object,$request['method']),$request['params'])) !== FALSE) {
-        $response = array (
-                  'id' => $request['id'],
-                  'result' => $result,
-                  'error' => NULL
-                  );
-      } else {
-        $response = array (
-                  'id' => $request['id'],
-                  'result' => NULL,
-                  'error' => 'unknown method or incorrect parameters'
-                  );
-      }
-    } catch (Exception $e) {
-      $response = array (
-                'id' => $request['id'],
-                'result' => NULL,
-                'error' => $e->getMessage()
-                );
-    }
+		// executes the task on local object
+		try {
+			if (($result = @call_user_func_array(array($object,$request['method']),$request['params'])) !== FALSE) {
+				$response = array (
+									'id' => $request['id'],
+									'result' => $result,
+									'error' => NULL
+									);
+			} else {
+				$response = array (
+									'id' => $request['id'],
+									'result' => NULL,
+									'error' => 'unknown method or incorrect parameters'
+									);
+			}
+		} catch (Exception $e) {
+			$response = array (
+								'id' => $request['id'],
+								'result' => NULL,
+								'error' => $e->getMessage()
+								);
+		}
 
-    /* output the response */
-    /* notifications don't want response */
-    if (!empty($request['id'])) {
-      header('content-type: text/javascript');
-      echo json_encode($response);
-    }
+		// output the response
+    // notifications don't want response
+		if (!empty($request['id'])) {
+			header('content-type: text/javascript');
+			echo json_encode($response);
+		}
 
-    return true;
-  }
+		// finish
+		return true;
+	}
 }
 ?>
diff --git a/webservice/locale/ar/fusiondirectory.po b/webservice/locale/ar/fusiondirectory.po
index 6c811bad9300ccb1023db2727063d4771e7a6f1d..a70bc0eff00af1dbc8643433076b00bfd35ccf4b 100644
--- a/webservice/locale/ar/fusiondirectory.po
+++ b/webservice/locale/ar/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ca/fusiondirectory.po b/webservice/locale/ca/fusiondirectory.po
index a6a61ea1106d93b03859e7045718b67875d5889f..68d03eb9cb364ed33751521e45bee75cc5f6fe58 100644
--- a/webservice/locale/ca/fusiondirectory.po
+++ b/webservice/locale/ca/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,47 +41,48 @@ msgstr ""
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³ %s/%s del FusionDirectori no Ã©s llegible. S'estÃ  avortant."
+msgstr ""
+"La configuraciÃ³ %s/%s del FusionDirectori no Ã©s llegible. S'estÃ  avortant."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/cs_CZ/fusiondirectory.po b/webservice/locale/cs_CZ/fusiondirectory.po
index d8dca67418b81c487358b136ea0c868b71ef8f8b..e0ecb44afc8d9639939151d933a61e36dcf11e71 100644
--- a/webservice/locale/cs_CZ/fusiondirectory.po
+++ b/webservice/locale/cs_CZ/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,42 +46,43 @@ msgstr "NastavenÃ %s/%s FusionDirectory nenÃ ÄitelnÃ©. Akce byla zruÅ¡ena."
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Nelze nalÃ©zt soubor %s â€“ opravte to spuÅ¡tÄ›nÃm %s (na serveru)."
+msgstr ""
+"Nemohu nalÃ©zt soubor '%s' â€“ opravte to prosÃm spuÅ¡tÄ›nÃm '%s' (na serveru)."
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
-msgstr "ZÃ¡suvnÃ½ modul"
+msgstr "zÃ¡suvnÃ½ modul"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "%s nelze smazat. Je uzamÄeno %s."
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 d83cddeb41adc2fd9afcdcd972c0be3563554358..a9774d28ce686504ef163ef4832033c3df8a87d1 100644
--- a/webservice/locale/de/fusiondirectory.po
+++ b/webservice/locale/de/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,42 +46,44 @@ msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Konnte Datei '%s' nicht finden - bitte fÃ¼hren Sie '%s' aus um das Problem zu beseitigen"
+msgstr ""
+"Konnte Datei '%s' nicht finden - bitte fÃ¼hren Sie '%s' aus um das Problem zu"
+" beseitigen"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 7fbfe25ad0f60801802eca96c608fceebd6efbb1..9cfd8ca97188de870fb947b626429903a4be996c 100644
--- a/webservice/locale/el_GR/fusiondirectory.po
+++ b/webservice/locale/el_GR/fusiondirectory.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Nikos Charonitakis <charosn@her.forthnet.gr>, 2005
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,47 +41,50 @@ msgstr "ÎÎ± ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹ Î¼ÏŒÎ½Î¿ Î±Î¹Ï„Î®ÏƒÎµÎ¹Ï‚ HTTPS JSON-RPC"
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ %s/%s  Ï„Î¿Ï… FusionDirectory Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³Î½ÏŽÏƒÎ¹Î¼ÎµÏ‚. Î•Î³ÎºÎ±Ï„Î¬Î»ÎµÎ¹ÏˆÎ·"
+msgstr ""
+"ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ %s/%s  Ï„Î¿Ï… FusionDirectory Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±Î³Î½ÏŽÏƒÎ¹Î¼ÎµÏ‚. Î•Î³ÎºÎ±Ï„Î¬Î»ÎµÎ¹ÏˆÎ·"
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Î±ÏÏ‡ÎµÎ¯Î¿Ï… '%s' - Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎºÏ„ÎµÎ»ÎÏƒÏ„Îµ Ï„Î¿ '%s' Î³Î¹Î± Î½Î± Ï„Î¿ Î´Î¹Î¿ÏÎ¸ÏŽÏƒÎµÏ„Îµ"
+msgstr ""
+"Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Î±ÏÏ‡ÎµÎ¯Î¿Ï… '%s' - Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎºÏ„ÎµÎ»ÎÏƒÏ„Îµ Ï„Î¿ '%s' Î³Î¹Î± Î½Î± Ï„Î¿ "
+"Î´Î¹Î¿ÏÎ¸ÏŽÏƒÎµÏ„Îµ"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Î ÏÏŒÏƒÎ¸ÎµÏ„Î¿"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®Ï‚ %s. ÎˆÏ‡ÎµÎ¹ ÎºÎ»ÎµÎ¹Î´Ï‰Î¸ÎµÎ¯ Î±Ï€ÏŒ Ï„Î¿  %s."
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/en/fusiondirectory.po b/webservice/locale/en/fusiondirectory.po
index cd66324c546b855425af85e8c4ff604768ca4fe4..b5ed4dc21ad36273c9024e6596bb005f48334f4f 100644
--- a/webservice/locale/en/fusiondirectory.po
+++ b/webservice/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
+"POT-Creation-Date: 2017-04-05 19:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -47,42 +47,42 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid ""
 "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid ""
 "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/es/fusiondirectory.po b/webservice/locale/es/fusiondirectory.po
index c55ac5da70b193fef66c720a85e525b4403f24a3..5a7cc7d74cb952908050ea330458724faa292fdc 100644
--- a/webservice/locale/es/fusiondirectory.po
+++ b/webservice/locale/es/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,47 +41,50 @@ msgstr ""
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
+msgstr ""
+"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
+"solucionarlo"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "ExtensiÃ³n"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 814b02f1759a1bbfdd092d704dd61cf2fe813e6f..46e810a264a2267f2a56a43efc7fc661a2096ada 100644
--- a/webservice/locale/es_CO/fusiondirectory.po
+++ b/webservice/locale/es_CO/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,47 +41,51 @@ msgstr ""
 #: html/jsonrpc.php:52
 #, 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."
+msgstr ""
+"La configuraciÃ³n %s/%s de FusionDirectory no tiene permisos de lectura. "
+"Abortado."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar esto."
+msgstr ""
+"No se encuentra el archivo '%s' - por favor ejecute '%s' para  arreglar "
+"esto."
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 8a1fec163f6f00b6871d2e5724f455e13a261a02..0b73af755895302669681976198ad79de9d3d0a6 100644
--- a/webservice/locale/es_VE/fusiondirectory.po
+++ b/webservice/locale/es_VE/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,47 +41,50 @@ msgstr ""
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
+msgstr ""
+"La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
+msgstr ""
+"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
+"solucionarlo"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "ExtensiÃ³n"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 491d3451d29581bc2fe605b7e7327a368405b996..4afb78bf752f386e5a1da0afab3349c026cf7b1d 100644
--- a/webservice/locale/fa_IR/fusiondirectory.po
+++ b/webservice/locale/fa_IR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +48,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "ÙØ§ÛŒÙ„ '%s' Ø±Ø§ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ù… Ù¾ÛŒØ¯Ø§ Ú©Ù†Ù… Ø¨Ø±Ø§ÛŒ Ø±ÙØ¹ Ù…Ø´Ú©Ù„ Ø¯Ø³ØªÙˆØ± '%s' Ø±Ø§ Ø¨Ø²Ù†ÛŒØ¯."
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Ù¾Ù„Ø§Ú¯ÛŒÙ†"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fi_FI/fusiondirectory.po b/webservice/locale/fi_FI/fusiondirectory.po
index 31ab46808d6ac3494bbc43d846e51e18ec6bf0d0..eacaab94bb5dc46dec3a197456cba3498a7bc9e7 100644
--- a/webservice/locale/fi_FI/fusiondirectory.po
+++ b/webservice/locale/fi_FI/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/fr/fusiondirectory.po b/webservice/locale/fr/fusiondirectory.po
index bc0736be4c3e40529c684ddd45c6a5f290bcb72d..71c54f22aceabff21edcc0a4115d5b728c0a03ac 100644
--- a/webservice/locale/fr/fusiondirectory.po
+++ b/webservice/locale/fr/fusiondirectory.po
@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Benoit Mortier <benoit.mortier@opensides.be>, 2015-2017
-# MCMic, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
+"Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,11 +20,11 @@ msgstr ""
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
-msgstr "Configuration du service Web"
+msgstr "Configuration du Service Web"
 
 #: config/class_webserviceConfig.inc:29
 msgid "FusionDirectory webservice plugin configuration"
-msgstr "Configuration du plugin webservice"
+msgstr "Configuration du plugin Service Web"
 
 #: config/class_webserviceConfig.inc:42
 msgid "Webservice"
@@ -42,47 +41,55 @@ msgstr "Ne permettre que les connexions JSON-RPC en HTTPS"
 #: html/jsonrpc.php:52
 #, 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."
+msgstr ""
+"Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. "
+"Abandon."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Fichier '%s' non trouvÃ© - veuillez exÃ©cuter '%s' pour rÃ©gler ce problÃ¨me"
+msgstr ""
+"Je n'ai pas trouvÃ© '%s' - veuillez exÃ©cuter '%s' pour rÃ©gler ce problÃ¨me"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "Extension"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Impossible dâ€™effacer %s. Il a Ã©tÃ© verrouillÃ© par %s."
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
-msgstr "Impossible d'obtenir la mÃ©thode de mot de passe pour le compte \"%s\". Le compte n'a pas Ã©tÃ© verrouillÃ© !"
+msgstr ""
+"Impossible d'obtenir la mÃ©thode de mot de passe pour le compte \"%s\". Le "
+"compte n'a pas Ã©tÃ© verrouillÃ© !"
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
-msgstr "MÃ©thode de mot de passe \"%s\" a Ã©chouÃ©. Le compte \"%s\" n'a pas Ã©tÃ© verrouillÃ©!"
+msgstr ""
+"MÃ©thode de mot de passe \"%s\" a Ã©chouÃ©. Le compte \"%s\" n'a pas Ã©tÃ© "
+"verrouillÃ©!"
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, 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Ã©!"
+msgstr ""
+"Impossible de trouver le compte \"%s\" dans LDAP. Il n'a pas Ã©tÃ© verrouillÃ©!"
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, 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
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Impossible de trouver le compte \"%s\" dans LDAP"
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 237f29b848d5bd6659c06c6d6fa0b68fbdb394e7..a5757283828c659ff0dcd791b30a0ace7ff64c40 100644
--- a/webservice/locale/hu_HU/fusiondirectory.po
+++ b/webservice/locale/hu_HU/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/id/fusiondirectory.po b/webservice/locale/id/fusiondirectory.po
index 3dca22ff8f25716d8c8902643c0a84be9823da24..1ea5081c6c813b1e11b7a2514d713a53141cee99 100644
--- a/webservice/locale/id/fusiondirectory.po
+++ b/webservice/locale/id/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/it_IT/fusiondirectory.po b/webservice/locale/it_IT/fusiondirectory.po
index 13076bd15654385b32b1b16ef4d3dba5fdbc25c0..73db237d29e9368386130721a025044932baf03c 100644
--- a/webservice/locale/it_IT/fusiondirectory.po
+++ b/webservice/locale/it_IT/fusiondirectory.po
@@ -1,19 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
-# Paola Penati <paola.penati@opensides.be>, 2015
-# Paola Penati <paola.penati@opensides.be>, 2015-2017
-# Paola Penati <paola.penati@opensides.be>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\n"
-"PO-Revision-Date: 2017-01-13 17:03+0000\n"
-"Last-Translator: Paola Penati <paola.penati@opensides.be>\n"
-"Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
+"Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,47 +41,53 @@ msgstr "Permetti soltanto richieste HTTPS JSON-RPC "
 #: html/jsonrpc.php:52
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr "Il file di configurazione %s/%s non Ã¨ leggibile. Operazione Annullata."
+msgstr ""
+"Il file di configurazione %s/%s non Ã¨ leggibile. Operazione Annullata."
 
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
+msgstr ""
+"Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr "Non puoi cancellare %s perchÃ© Ã© ancora utilizzata da %s"
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
-msgstr "Impossibile ottenere metodo di password per l'account\"%s\". Non Ã¨ stato bloccato!"
+msgstr ""
+"Impossibile ottenere metodo di password per l'account\"%s\". Non Ã¨ stato "
+"bloccato!"
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
-msgstr "Il metodo di bloccaggio \"%s\" Ã© fallito. L'account \"%s\" non Ã© stato bloccato!"
+msgstr ""
+"Il metodo di bloccaggio \"%s\" Ã© fallito. L'account \"%s\" non Ã© stato "
+"bloccato!"
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, 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
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, 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
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr "Impossibile trovare  l'account \"%s\" nell'annuario LDAP"
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 7955cec284c8edf1119ac638baf5370f349ce8fd..a08d1610e5a9f2b46f17c156cd7f55ea5b923276 100644
--- a/webservice/locale/lv/fusiondirectory.po
+++ b/webservice/locale/lv/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nb/fusiondirectory.po b/webservice/locale/nb/fusiondirectory.po
index b6ca73dc3599be3f3be53a974fa09236615b0d8a..e3063c6e6b307833a988b73182719630a2d7fba5 100644
--- a/webservice/locale/nb/fusiondirectory.po
+++ b/webservice/locale/nb/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/nl/fusiondirectory.po b/webservice/locale/nl/fusiondirectory.po
index 31e30b71f0aa03f56ee4f1e3ea63b5862dd5fbc7..a40bb811ecd3d5e342601b3265d87578bdad6250 100644
--- a/webservice/locale/nl/fusiondirectory.po
+++ b/webservice/locale/nl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
+"Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,23 +20,23 @@ msgstr ""
 
 #: config/class_webserviceConfig.inc:28
 msgid "Webservice configuration"
-msgstr ""
+msgstr "Webservice configuratie"
 
 #: config/class_webserviceConfig.inc:29
 msgid "FusionDirectory webservice plugin configuration"
-msgstr ""
+msgstr "FusionDirectory webservice plugin configuratie"
 
 #: config/class_webserviceConfig.inc:42
 msgid "Webservice"
-msgstr ""
+msgstr "Webservice"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Force SSL"
-msgstr ""
+msgstr "SSL forceren"
 
 #: config/class_webserviceConfig.inc:45
 msgid "Allow only HTTPS JSON-RPC requests"
-msgstr ""
+msgstr "Enkel HTTP JSON-RPC aanvragen toeg"
 
 #: html/jsonrpc.php:52
 #, php-format
@@ -47,40 +48,44 @@ msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
-msgstr ""
+msgstr "%s kan niet verwijderd worden. Het is geblokkeerd door %s."
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
+"Kan de wachtwoord methode niet opvragen voor account \"%s\". Het is niet "
+"geblokkeerd!"
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
+"Kan wachtwoord methode \"%s\" niet blokkeren. Het account \"%s\" is niet "
+"geblokkeerd."
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
-msgstr ""
+msgstr "Kan het account \"%s\" niet vinden in LDAP. Het is niet geblokkeerd."
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
-msgstr ""
+msgstr "Kan de wachtwoord methode niet opvragen voor account \"%s\"."
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
-msgstr ""
+msgstr "Kan het account \"%s\" in LDAP niet vinden"
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 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 e9fc2db0bbb0d30163e17e338e3317adc00d4a50..0f7f5f176cc12ebaaa35ec0a64c28efa8db50d95 100644
--- a/webservice/locale/pl/fusiondirectory.po
+++ b/webservice/locale/pl/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +48,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt/fusiondirectory.po b/webservice/locale/pt/fusiondirectory.po
index 79e834d09565413782645c91d4be97053b63dbff..4d0e4ecac32af418435be7ea282202b7be3b48c3 100644
--- a/webservice/locale/pt/fusiondirectory.po
+++ b/webservice/locale/pt/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/pt_BR/fusiondirectory.po b/webservice/locale/pt_BR/fusiondirectory.po
index 0a0874d7e7322e86827d0c225074f0a2789d352f..58e2e7deaca07b8c505a33b5eeb40dbf36238afa 100644
--- a/webservice/locale/pt_BR/fusiondirectory.po
+++ b/webservice/locale/pt_BR/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,42 +46,44 @@ msgstr "Abortado. ConfiguraÃ§Ã£o %s/%s do FusionDirectory nÃ£o pÃ´de ser lida."
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "NÃ£o foi possÃvel localizar o arquivo '%s' - execute '%s' para solucionar o problema"
+msgstr ""
+"NÃ£o foi possÃvel localizar o arquivo '%s' - execute '%s' para solucionar o "
+"problema"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru/fusiondirectory.po b/webservice/locale/ru/fusiondirectory.po
index 84ce85bdf4b3596cb4dff922ccfa24d2f8b15ad0..f13888ded72034b69fad4e1688627f74b13e710b 100644
--- a/webservice/locale/ru/fusiondirectory.po
+++ b/webservice/locale/ru/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,42 +46,44 @@ msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ FusionDirectory %s/%s Ð½Ðµ Ñ‡Ð¸Ñ‚Ð°ÐµÐ¼Ð°. ÐŸÑ€
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» '%s' - Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ '%s', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾."
+msgstr ""
+"ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» '%s' - Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ '%s', Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ "
+"ÑÑ‚Ð¾."
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "ÐŸÐ»Ð°Ð³Ð¸Ð½"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ru@petr1708/fusiondirectory.po b/webservice/locale/ru@petr1708/fusiondirectory.po
index 1dc6436a1f1c8e0cb8eda6f3d0ea77290f6e1028..4a265354c0631bb39aea22024693709f89531087 100644
--- a/webservice/locale/ru@petr1708/fusiondirectory.po
+++ b/webservice/locale/ru@petr1708/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/sv/fusiondirectory.po b/webservice/locale/sv/fusiondirectory.po
index f7b0f38d44134272f2a7773550ffbc042d6e8859..fa1a2528cae23b16d179515ee9380d513b7ff9c2 100644
--- a/webservice/locale/sv/fusiondirectory.po
+++ b/webservice/locale/sv/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,42 +46,43 @@ msgstr "FusionDirectory-konfiguration %s/%s Ã¤r inte lÃ¤sbar. Avbryter."
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Kan inte lokalisera filen '%s' - vÃ¤nligen kÃ¶r '%s' fÃ¶r att Ã¥tgÃ¤rda detta"
+msgstr ""
+"Kan inte lokalisera filen '%s' - vÃ¤nligen kÃ¶r '%s' fÃ¶r att Ã¥tgÃ¤rda detta"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/ug/fusiondirectory.po b/webservice/locale/ug/fusiondirectory.po
index 2c952a61f3afbb67524bca859cf21486de7a1780..8249e98e1f3e45630ba1513e7bbbb2f408839383 100644
--- a/webservice/locale/ug/fusiondirectory.po
+++ b/webservice/locale/ug/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/vi_VN/fusiondirectory.po b/webservice/locale/vi_VN/fusiondirectory.po
index 8034094c3181771564239f630b8f89f5ce7ed872..a46539b4473b5e5de6b99bdb4e440b6c55ae6418 100644
--- a/webservice/locale/vi_VN/fusiondirectory.po
+++ b/webservice/locale/vi_VN/fusiondirectory.po
@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
+"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,42 +46,43 @@ msgstr ""
 #: html/jsonrpc.php:62
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "KhÃ´ng thá»ƒ xÃ¡c Ä‘á»‹nh vá»‹ trÃ file '%s'- xin hÃ£y cháº¡y '%s' Ä‘á»ƒ sá»a lá»—i nÃ y!"
+msgstr ""
+"KhÃ´ng thá»ƒ xÃ¡c Ä‘á»‹nh vá»‹ trÃ file '%s'- xin hÃ£y cháº¡y '%s' Ä‘á»ƒ sá»a lá»—i nÃ y!"
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""
diff --git a/webservice/locale/zh/fusiondirectory.po b/webservice/locale/zh/fusiondirectory.po
index 2c5ca6a7d1337702455c14ef4b90e24fbc13210b..93495d0dc88062abda429b6c19e528ba5f375c04 100644
--- a/webservice/locale/zh/fusiondirectory.po
+++ b/webservice/locale/zh/fusiondirectory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR FusionDirectory Project
 # This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory-110\n"
+"Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2017-03-30 18:10+0200\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"
+"POT-Creation-Date: 2017-04-21 17:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,40 +47,40 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/jsonrpc.php:312 html/jsonrpc.php:396
+#: html/jsonrpc.php:319 html/jsonrpc.php:402
 msgid "Plugin"
 msgstr ""
 
-#: html/jsonrpc.php:491
+#: html/jsonrpc.php:494
 #, php-format
 msgid "Cannot delete %s. It has been locked by %s."
 msgstr ""
 
-#: html/jsonrpc.php:538 html/jsonrpc.php:567
+#: html/jsonrpc.php:541 html/jsonrpc.php:570
 #, php-format
 msgid "Failed to get password method for account \"%s\". It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:563
+#: html/jsonrpc.php:566
 #, php-format
 msgid "Password method \"%s\" failed locking. Account \"%s\" has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:570
+#: html/jsonrpc.php:573
 #, php-format
 msgid "Could not find account \"%s\" in LDAP. It has not been locked!"
 msgstr ""
 
-#: html/jsonrpc.php:608 html/jsonrpc.php:617
+#: html/jsonrpc.php:611 html/jsonrpc.php:620
 #, php-format
 msgid "Failed to get password method for account \"%s\""
 msgstr ""
 
-#: html/jsonrpc.php:620
+#: html/jsonrpc.php:623
 #, php-format
 msgid "Could not find account \"%s\" in LDAP"
 msgstr ""
 
-#: html/jsonrpc.php:664
+#: html/jsonrpc.php:667
 msgid "This token is invalid"
 msgstr ""